[release-15.0] Use a left join to make sure that tables with tablespa…

…ce=innodb_system are included in the schema (#12672) (#12734) * Use a left join to make sure that tables with tablespace=innodb_system are not skipped when loading the schema (fixes #12669) Signed-off-by: Oleksiy Kovyrin <[email protected]> * Set tablespace on a test table to see if it breaks vstreamer Signed-off-by: Oleksiy Kovyrin <[email protected]> --------- Signed-off-by: Oleksiy Kovyrin <[email protected]> Co-authored-by: Oleksiy Kovyrin <[email protected]>
vitessio · Mar 28, 2023 · 99b88e8 · 99b88e8
1 parent ddeabc7
commit 99b88e8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/go/mysql/flavor_mysql.go b/go/mysql/flavor_mysql.go
@@ -348,7 +348,7 @@ const TablesWithSize80 = `SELECT t.table_name,
 	SUM(i.file_size),
 	SUM(i.allocated_size)
 FROM information_schema.tables t
-INNER JOIN information_schema.innodb_tablespaces i
+LEFT JOIN information_schema.innodb_tablespaces i
 	ON i.name LIKE CONCAT(database(), '/%') AND (i.name = CONCAT(t.table_schema, '/', t.table_name) OR i.name LIKE CONCAT(t.table_schema, '/', t.table_name, '#p#%'))
 WHERE t.table_schema = database()
 GROUP BY t.table_name, t.table_type, t.create_time, t.table_comment`

diff --git a/go/test/endtoend/vreplication/vstream_test.go b/go/test/endtoend/vreplication/vstream_test.go
@@ -188,7 +188,7 @@ const vschemaUnsharded = `
 }
 `
 const schemaSharded = `
-create table customer(cid int, name varbinary(128), primary key(cid))  CHARSET=utf8mb4;
+create table customer(cid int, name varbinary(128), primary key(cid)) TABLESPACE innodb_system CHARSET=utf8mb4;
 `
 const vschemaSharded = `
 {