diff --git a/docs/content/overview/schema-collections.md b/docs/content/overview/schema-collections.md
index d8a4178b4..36ba177ca 100644
--- a/docs/content/overview/schema-collections.md
+++ b/docs/content/overview/schema-collections.md
@@ -1,6 +1,6 @@
 ---
-lastmod: 2023-12-15
 date: 2021-04-24
+lastmod: 2024-10-05
 title: Schema Collections
 customtitle: "Supported Schema Collections"
 description: Information about the schemas supported by MySqlConnection.GetSchema.
@@ -41,7 +41,6 @@ weight: 80
 * `Tables`—[information about tables](../schema/tables/)
 * `TableConstraints`
 * `TablePrivileges`
-* `TableSpaces`
 * `Triggers`
 * `UserPrivileges`
 * `Views`
diff --git a/src/MySqlConnector/Core/SchemaProvider.g.cs b/src/MySqlConnector/Core/SchemaProvider.g.cs
index b3575bc83..adacc5473 100644
--- a/src/MySqlConnector/Core/SchemaProvider.g.cs
+++ b/src/MySqlConnector/Core/SchemaProvider.g.cs
@@ -67,8 +67,6 @@ public async ValueTask<DataTable> GetSchemaAsync(IOBehavior ioBehavior, string c
 			await FillTableConstraintsAsync(ioBehavior, dataTable, "TableConstraints", restrictionValues, cancellationToken).ConfigureAwait(false);
 		else if (string.Equals(collectionName, "TablePrivileges", StringComparison.OrdinalIgnoreCase))
 			await FillTablePrivilegesAsync(ioBehavior, dataTable, "TablePrivileges", restrictionValues, cancellationToken).ConfigureAwait(false);
-		else if (string.Equals(collectionName, "TableSpaces", StringComparison.OrdinalIgnoreCase))
-			await FillTableSpacesAsync(ioBehavior, dataTable, "TableSpaces", restrictionValues, cancellationToken).ConfigureAwait(false);
 		else if (string.Equals(collectionName, "Triggers", StringComparison.OrdinalIgnoreCase))
 			await FillTriggersAsync(ioBehavior, dataTable, "Triggers", restrictionValues, cancellationToken).ConfigureAwait(false);
 		else if (string.Equals(collectionName, "UserPrivileges", StringComparison.OrdinalIgnoreCase))
@@ -125,7 +123,6 @@ private Task FillMetaDataCollectionsAsync(IOBehavior ioBehavior, DataTable dataT
 		dataTable.Rows.Add("Tables", 4, 3);
 		dataTable.Rows.Add("TableConstraints", 0, 3);
 		dataTable.Rows.Add("TablePrivileges", 0, 0);
-		dataTable.Rows.Add("TableSpaces", 0, 0);
 		dataTable.Rows.Add("Triggers", 0, 3);
 		dataTable.Rows.Add("UserPrivileges", 0, 0);
 		dataTable.Rows.Add("Views", 0, 3);
@@ -757,28 +754,6 @@ private async Task FillTablePrivilegesAsync(IOBehavior ioBehavior, DataTable dat
 		await FillDataTableAsync(ioBehavior, dataTable, "TABLE_PRIVILEGES", null, cancellationToken).ConfigureAwait(false);
 	}
 
-	private async Task FillTableSpacesAsync(IOBehavior ioBehavior, DataTable dataTable, string tableName, string?[]? restrictionValues, CancellationToken cancellationToken)
-	{
-		if (restrictionValues is not null && restrictionValues.Length > 0)
-			throw new ArgumentException("restrictionValues is not supported for schema 'TableSpaces'.", nameof(restrictionValues));
-
-		dataTable.TableName = tableName;
-		dataTable.Columns.AddRange(
-		[
-			new("TABLESPACE_NAME", typeof(string)),
-			new("ENGINE", typeof(string)),
-			new("TABLESPACE_TYPE", typeof(string)),
-			new("LOGFILE_GROUP_NAME", typeof(string)),
-			new("EXTENT_SIZE", typeof(long)),
-			new("AUTOEXTEND_SIZE", typeof(long)),
-			new("MAXIMUM_SIZE", typeof(long)),
-			new("NODEGROUP_ID", typeof(long)),
-			new("TABLESPACE_COMMENT", typeof(string)),
-		]);
-
-		await FillDataTableAsync(ioBehavior, dataTable, "TABLESPACES", null, cancellationToken).ConfigureAwait(false);
-	}
-
 	private async Task FillTriggersAsync(IOBehavior ioBehavior, DataTable dataTable, string tableName, string?[]? restrictionValues, CancellationToken cancellationToken)
 	{
 		if (restrictionValues is not null && restrictionValues.Length > 0)
diff --git a/tools/SchemaCollectionGenerator/SchemaCollections.yaml b/tools/SchemaCollectionGenerator/SchemaCollections.yaml
index 770166cae..47c464b7c 100644
--- a/tools/SchemaCollectionGenerator/SchemaCollections.yaml
+++ b/tools/SchemaCollectionGenerator/SchemaCollections.yaml
@@ -652,28 +652,6 @@
   - name: IS_GRANTABLE
     type: string
 
-- name: TableSpaces
-  table: TABLESPACES
-  columns:
-  - name: TABLESPACE_NAME
-    type: string
-  - name: ENGINE
-    type: string
-  - name: TABLESPACE_TYPE
-    type: string
-  - name: LOGFILE_GROUP_NAME
-    type: string
-  - name: EXTENT_SIZE
-    type: long
-  - name: AUTOEXTEND_SIZE
-    type: long
-  - name: MAXIMUM_SIZE
-    type: long
-  - name: NODEGROUP_ID
-    type: long
-  - name: TABLESPACE_COMMENT
-    type: string
-
 - name: Triggers
   table: TRIGGERS
   identifierPartCount: 3