diff options
| author | unknown <Dao-Gang.Qu@sun.com> | 2010-01-12 20:07:09 +0800 |
|---|---|---|
| committer | unknown <Dao-Gang.Qu@sun.com> | 2010-01-12 20:07:09 +0800 |
| commit | 16e15e69523c5aebd6642a47b216f736cfd456a2 (patch) | |
| tree | 81fd0ce6bdc321649671cd1240deb0d5b1248e49 /mysql-test/r/log_tables.result | |
| parent | 4b67a11d2bf201e273be79054b26e90ada15be38 (diff) | |
| parent | 3701208a2e890d42aabc678a2a5d4ea539941b36 (diff) | |
| download | mariadb-git-16e15e69523c5aebd6642a47b216f736cfd456a2.tar.gz | |
Manual merge from next-mr.
Diffstat (limited to 'mysql-test/r/log_tables.result')
| -rw-r--r-- | mysql-test/r/log_tables.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/log_tables.result b/mysql-test/r/log_tables.result index 80684e5f5d2..1666d5e0297 100644 --- a/mysql-test/r/log_tables.result +++ b/mysql-test/r/log_tables.result @@ -249,7 +249,7 @@ set @save_storage_engine= @@session.storage_engine; set storage_engine= MEMORY; alter table mysql.slow_log engine=NonExistentEngine; Warnings: -Warning 1286 Unknown table engine 'NonExistentEngine' +Warning 1286 Unknown storage engine 'NonExistentEngine' alter table mysql.slow_log engine=memory; ERROR HY000: This storage engine cannot be used for log tables" set storage_engine= @save_storage_engine; |