summaryrefslogtreecommitdiff
path: root/sql/share
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 /sql/share
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 'sql/share')
-rw-r--r--sql/share/errmsg.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index 2228ded870b..aa85be6f551 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -5960,3 +5960,7 @@ ER_HOSTNAME
eng "host name"
ER_WRONG_STRING_LENGTH
eng "String '%-.70s' is too long for %s (should be no longer than %d)"
+ER_UNSUPORTED_LOG_ENGINE
+ eng "This storage engine cannot be used for log tables""
+ER_BAD_LOG_STATEMENT
+ eng "You cannot %s a log table if logging is enabled"