summaryrefslogtreecommitdiff
path: root/mysql-test/r/log_tables.result
diff options
context:
space:
mode:
authorunknown <petr/cps@mysql.com/owlet.local>2006-09-15 13:07:23 +0400
committerunknown <petr/cps@mysql.com/owlet.local>2006-09-15 13:07:23 +0400
commitabbb201661144f2a75d70c32da49dcb1692be412 (patch)
tree3a1c4f6bd0d0e7921561f89e6d54d823f9a3f2c2 /mysql-test/r/log_tables.result
parentd57163fcf84d6fc0e8cad5fdbbe5c14274eb694c (diff)
downloadmariadb-git-abbb201661144f2a75d70c32da49dcb1692be412.tar.gz
Post-review fixes for
Bug #18559 "log tables cannot change engine, and gets deadlocked when dropping w/ log on": 1) Add more generic error messages 2) Add new handlerton flag for engines, which support log tables 3) Remove (log-tables related) mutex lock in myisam to improve performance mysql-test/r/log_tables.result: update result file to use new error messages mysql-test/t/log_tables.test: update test file with new error messages sql/handler.h: Add new handlerton flag, to mark whether engine supports log tables sql/share/errmsg.txt: Add more generic error messages sql/sql_table.cc: Update error messages storage/csv/ha_tina.cc: CSV supports log tables storage/myisam/ha_myisam.cc: MyISAM supports log tables storage/myisam/mi_write.c: remove mutex lock to improve performance
Diffstat (limited to 'mysql-test/r/log_tables.result')
-rw-r--r--mysql-test/r/log_tables.result18
1 files changed, 9 insertions, 9 deletions
diff --git a/mysql-test/r/log_tables.result b/mysql-test/r/log_tables.result
index 638c05dd712..59cef29dc8f 100644
--- a/mysql-test/r/log_tables.result
+++ b/mysql-test/r/log_tables.result
@@ -73,16 +73,16 @@ select * from mysql.slow_log;
start_time user_host query_time lock_time rows_sent rows_examined db last_insert_id insert_id server_id sql_text
TIMESTAMP USER_HOST QUERY_TIME 00:00:00 1 0 test 0 0 1 select sleep(2)
alter table mysql.general_log engine=myisam;
-ERROR HY000: You can't alter a log table if logging is enabled
+ERROR HY000: You cannot alter a log table if logging is enabled
alter table mysql.slow_log engine=myisam;
-ERROR HY000: You can't alter a log table if logging is enabled
+ERROR HY000: You cannot alter a log table if logging is enabled
drop table mysql.general_log;
-ERROR HY000: Cannot drop log table if log is enabled
+ERROR HY000: You cannot drop a log table if logging is enabled
drop table mysql.slow_log;
-ERROR HY000: Cannot drop log table if log is enabled
+ERROR HY000: You cannot drop a log table if logging is enabled
set global general_log='OFF';
alter table mysql.slow_log engine=myisam;
-ERROR HY000: You can't alter a log table if logging is enabled
+ERROR HY000: You cannot alter a log table if logging is enabled
set global slow_query_log='OFF';
show create table mysql.general_log;
Table Create Table
@@ -173,13 +173,13 @@ unlock tables;
set global general_log='OFF';
set global slow_query_log='OFF';
alter table mysql.slow_log engine=ndb;
-ERROR HY000: One can use only CSV and MyISAM engines for the log tables
+ERROR HY000: This storage engine cannot be used for log tables"
alter table mysql.slow_log engine=innodb;
-ERROR HY000: One can use only CSV and MyISAM engines for the log tables
+ERROR HY000: This storage engine cannot be used for log tables"
alter table mysql.slow_log engine=archive;
-ERROR HY000: One can use only CSV and MyISAM engines for the log tables
+ERROR HY000: This storage engine cannot be used for log tables"
alter table mysql.slow_log engine=blackhole;
-ERROR HY000: One can use only CSV and MyISAM engines for the log tables
+ERROR HY000: This storage engine cannot be used for log tables"
drop table mysql.slow_log;
drop table mysql.general_log;
drop table mysql.general_log;