[release-15.0] Use a left join to make sure that tables with tablespace=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 <oleksiy.kovyrin@shopify.com>

* Set tablespace on a test table to see if it breaks vstreamer

Signed-off-by: Oleksiy Kovyrin <oleksiy.kovyrin@shopify.com>

---------

Signed-off-by: Oleksiy Kovyrin <oleksiy.kovyrin@shopify.com>
Co-authored-by: Oleksiy Kovyrin <oleksiy.kovyrin@shopify.com>
This commit is contained in:
vitess-bot[bot] 2023-03-28 09:55:33 +02:00 коммит произвёл GitHub
Родитель ddeabc7598
Коммит 99b88e8ff4
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
2 изменённых файлов: 2 добавлений и 2 удалений

Просмотреть файл

@ -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`

Просмотреть файл

@ -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 = `
{