diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-08-22 11:40:39 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-08-22 11:40:39 +0200 |
| commit | cefc30b1663114930439e03dec245604bc904604 (patch) | |
| tree | 83a4479fe38adb24e478dde743856f04d65fa801 /mysql-test/t/mysqldump.test | |
| parent | 34f2f8ea41726d98e50752ff3453ebde70912c35 (diff) | |
| parent | 171355077501da7ddd32778ab3ebe77c5f7ce7da (diff) | |
| download | mariadb-git-cefc30b1663114930439e03dec245604bc904604.tar.gz | |
merge with MySQL 5.1.65
Diffstat (limited to 'mysql-test/t/mysqldump.test')
| -rw-r--r-- | mysql-test/t/mysqldump.test | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index bfbb18b7aed..39d0c294a39 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -2315,9 +2315,32 @@ DROP DATABASE BUG52792; USE test; +# Wait till we reached the initial number of concurrent sessions +--source include/wait_until_count_sessions.inc + --echo # ---echo # End of 5.1 tests +--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; -# Wait till we reached the initial number of concurrent sessions ---source include/wait_until_count_sessions.inc +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 enable general_log and slow_log +SET @@global.log_output="TABLE"; +SET @@global.general_log='ON'; +SET @@global.slow_query_log='ON'; +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 # |