diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-06-27 17:22:23 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-06-27 17:22:23 +0300 |
| commit | aa67a198e8a29f2fdae84846cc1d8e74c2d47a83 (patch) | |
| tree | 47719240f2509a3fa373f54852b54d552ac6e844 /mysql-test/t/mysqldump.test | |
| parent | 9ebda8764d2e94096924c0a0181f5773d836114a (diff) | |
| parent | 072097174c8b91299fe74a3cd7c5248e6e3cfc57 (diff) | |
| download | mariadb-git-aa67a198e8a29f2fdae84846cc1d8e74c2d47a83.tar.gz | |
automatic merge with 5.5
Diffstat (limited to 'mysql-test/t/mysqldump.test')
| -rw-r--r-- | mysql-test/t/mysqldump.test | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index 920dbe76d1b..eaa2e7a8840 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -2413,3 +2413,30 @@ RESET MASTER; # Wait till we reached the initial number of concurrent sessions --source include/wait_until_count_sessions.inc + +--echo # +--echo # Bug#45740 MYSQLDUMP DOESN'T DUMP GENERAL_LOG AND SLOW_QUERY CAUSES RESTORE PROBLEM +--echo # +SET @old_log_output_state= @@global.log_output; +SET @old_general_log_state= @@global.general_log; +SET @old_slow_query_log_state= @@global.slow_query_log; + +call mtr.add_suppression("Failed to write to mysql.general_log"); +--exec $MYSQL_DUMP -uroot --all-databases > $MYSQLTEST_VARDIR/tmp/bug45740.sql +# Make log_output as table and disabling general_log and slow_log +SET @@global.log_output="TABLE"; +SET @@global.general_log='OFF'; +SET @@global.slow_query_log='OFF'; +DROP DATABASE mysql; +--exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug45740.sql +SHOW CREATE TABLE mysql.general_log; +SHOW CREATE TABLE mysql.slow_log; +--remove_file $MYSQLTEST_VARDIR/tmp/bug45740.sql + +SET @@global.log_output= @old_log_output_state; +SET @@global.slow_query_log= @old_slow_query_log_state; +SET @@global.general_log= @old_general_log_state; + +--echo # +--echo # End of 5.1 tests +--echo # |