From 3f619478f796eddbba6e39502fe941b285dd97b1 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 4 May 2024 20:00:34 +0200 Subject: Adding upstream version 1:10.11.6. Signed-off-by: Daniel Baumann --- mysql-test/suite/sysschema/t/mysqldump.test | 35 +++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 mysql-test/suite/sysschema/t/mysqldump.test (limited to 'mysql-test/suite/sysschema/t/mysqldump.test') diff --git a/mysql-test/suite/sysschema/t/mysqldump.test b/mysql-test/suite/sysschema/t/mysqldump.test new file mode 100644 index 00000000..35abc704 --- /dev/null +++ b/mysql-test/suite/sysschema/t/mysqldump.test @@ -0,0 +1,35 @@ +-- source include/not_embedded.inc +-- source include/have_innodb.inc +# Dump all databases +--exec $MYSQL_DUMP -uroot --all-databases > $MYSQLTEST_VARDIR/tmp/bug20902791.sql + +# Save a copy of the user/tables_priv, to restore later +# Otherwise the final mysql_upgrade will REPLACE and update timestamps etc. +CREATE TEMPORARY TABLE tmp_global_priv AS SELECT * FROM mysql.global_priv; +CREATE TEMPORARY TABLE tmp_tables_priv AS SELECT * FROM mysql.tables_priv; + +# Remove the sys schema +DROP DATABASE sys; + +# Reload the dump +--exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug20902791.sql + +# The sys schema should not exist +SHOW DATABASES; + +# Finally reload the sys schema to return to normal +--exec $MYSQL_UPGRADE --skip-verbose --force 2>&1 +SHOW DATABASES; + +# Restore the saved privileges +TRUNCATE TABLE mysql.global_priv; +INSERT INTO mysql.global_priv (SELECT * FROM tmp_global_priv); +DROP TEMPORARY TABLE tmp_global_priv; + +TRUNCATE TABLE mysql.tables_priv; +INSERT INTO mysql.tables_priv (SELECT * FROM tmp_tables_priv); +DROP TEMPORARY TABLE tmp_tables_priv; + +FLUSH PRIVILEGES; +--let $MYSQLD_DATADIR= `select @@datadir` +--remove_file $MYSQLD_DATADIR/mysql_upgrade_info -- cgit v1.2.3