mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
4c7af343e0
Cleaned up mysql_upgrade --help and mysqlcheck --help client/mysql_upgrade.c: Increased version number. Marked all options that are not used 'Not used'. Don't write 'Looking for tool' if not using --verbose client/mysqlcheck.c: Cleanup output for --help Reset not initialzed variable mysql-test/r/log_tables_upgrade.result: Updated results mysql-test/r/mysql_upgrade.result: Updated results mysql-test/r/mysqlcheck.result: Updated results mysql-test/t/log_tables_upgrade.test: mysql_upgrade is now run without --skip-verbose mysql-test/t/mysql_upgrade.test: mysql_upgrade is now run without --skip-verbose
32 lines
987 B
Text
32 lines
987 B
Text
--source include/not_embedded.inc
|
|
--source include/have_csv.inc
|
|
|
|
# Only run test if "mysql_upgrade" is found
|
|
--require r/have_mysql_upgrade.result
|
|
--disable_query_log
|
|
select LENGTH("$MYSQL_UPGRADE")>0 as have_mysql_upgrade;
|
|
--enable_query_log
|
|
|
|
--echo #
|
|
--echo # Bug#49823: mysql_upgrade fatal error due to general_log / slow_low CSV NULL
|
|
--echo #
|
|
|
|
USE test;
|
|
|
|
let $MYSQLD_DATADIR= `SELECT @@datadir`;
|
|
copy_file std_data/bug49823.frm $MYSQLD_DATADIR/test/bug49823.frm;
|
|
copy_file std_data/bug49823.CSM $MYSQLD_DATADIR/test/bug49823.CSM;
|
|
copy_file std_data/bug49823.CSV $MYSQLD_DATADIR/test/bug49823.CSV;
|
|
|
|
SET @saved_general_log = @@GLOBAL.general_log;
|
|
SET GLOBAL general_log = OFF;
|
|
USE mysql;
|
|
FLUSH TABLES;
|
|
REPAIR TABLE test.bug49823;
|
|
RENAME TABLE general_log TO renamed_general_log;
|
|
RENAME TABLE test.bug49823 TO general_log;
|
|
--exec $MYSQL_UPGRADE --force 2>&1
|
|
DROP TABLE general_log;
|
|
RENAME TABLE renamed_general_log TO general_log;
|
|
SET GLOBAL general_log = @saved_general_log;
|
|
USE test;
|