diff options
author | Dmitry Shulga <Dmitry.Shulga@oracle.com> | 2010-11-08 00:06:22 +0600 |
---|---|---|
committer | Dmitry Shulga <Dmitry.Shulga@oracle.com> | 2010-11-08 00:06:22 +0600 |
commit | 7cd6bb264557589fbe08fd3da944886bbab149ab (patch) | |
tree | 6c4070690f1f0cb829b07c54bcc39e03e838802d /mysql-test/r/log_tables.result | |
parent | 5b8dbe96a566f4c304f3ebee7c2c4fcdd5793116 (diff) | |
parent | 8f237f5874a814daaa7431748849997d1a2aa8ea (diff) | |
download | mariadb-git-7cd6bb264557589fbe08fd3da944886bbab149ab.tar.gz |
Auto-merge from mysql-5.1-bugteam for bug#47924.
Diffstat (limited to 'mysql-test/r/log_tables.result')
-rw-r--r-- | mysql-test/r/log_tables.result | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/r/log_tables.result b/mysql-test/r/log_tables.result index 1666d5e0297..f64894c9f10 100644 --- a/mysql-test/r/log_tables.result +++ b/mysql-test/r/log_tables.result @@ -896,6 +896,16 @@ TIMESTAMP 1 1 SELECT SQL_NO_CACHE 'Bug#31700 - KEY', f1,f2,f3,SLEEP(1.1) FROM t1 TIMESTAMP 1 1 SELECT SQL_NO_CACHE 'Bug#31700 - PK', f1,f2,f3,SLEEP(1.1) FROM t1 WHERE f1=2 DROP TABLE t1; TRUNCATE TABLE mysql.slow_log; +use mysql; +drop table if exists renamed_general_log; +drop table if exists renamed_slow_log; +RENAME TABLE general_log TO renamed_general_log; +ERROR HY000: Cannot rename 'general_log'. When logging enabled, rename to/from log table must rename two tables: the log table to an archive table and another table back to 'general_log' +RENAME TABLE slow_log TO renamed_slow_log; +ERROR HY000: Cannot rename 'slow_log'. When logging enabled, rename to/from log table must rename two tables: the log table to an archive table and another table back to 'slow_log' +use test; +flush tables with read lock; +unlock tables; SET @@session.long_query_time= @old_long_query_time; SET @@global.log_output= @old_log_output; SET @@global.slow_query_log= @old_slow_query_log; |