diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2007-10-11 17:58:32 -0600 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2007-10-11 17:58:32 -0600 |
| commit | f22b95401e80a47f584f77d1997df62a8f8b84c6 (patch) | |
| tree | aaff15b1fd5ea4410fa33cd04c5143c5ff35e34d /mysql-test/r/log_tables.result | |
| parent | 03e74b8c5ea1764cb4f74e386d2a6ba4416e2e07 (diff) | |
| parent | 3df1613f2748f80a369969d5e5a7f55ccb203a19 (diff) | |
| download | mariadb-git-f22b95401e80a47f584f77d1997df62a8f8b84c6.tar.gz | |
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into weblab.(none):/home/marcsql/TREE/mysql-5.1-27858-b
mysql-test/r/log_tables.result:
Auto merged
Diffstat (limited to 'mysql-test/r/log_tables.result')
| -rw-r--r-- | mysql-test/r/log_tables.result | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/log_tables.result b/mysql-test/r/log_tables.result index 5e18e1273c0..c8857c582a9 100644 --- a/mysql-test/r/log_tables.result +++ b/mysql-test/r/log_tables.result @@ -270,6 +270,10 @@ use mysql; lock tables general_log read local, help_category read local; ERROR HY000: You can't use locks with log tables. unlock tables; +drop table if exists mysql.renamed_general_log; +drop table if exists mysql.renamed_slow_log; +drop table if exists mysql.general_log_new; +drop table if exists mysql.slow_log_new; use mysql; 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' |