summaryrefslogtreecommitdiff
path: root/sql/share/errmsg.txt
diff options
context:
space:
mode:
authormsvensson@neptunus.(none) <>2006-02-17 17:21:34 +0100
committermsvensson@neptunus.(none) <>2006-02-17 17:21:34 +0100
commitb2a13dd760d844443b7aa86e8c35be3f7033b9f1 (patch)
treed3a9c3db6152ba79cf9daa25d67bc9076e43a172 /sql/share/errmsg.txt
parenta50d87da347450c995f758893a50b8475ae0973b (diff)
parent9495f8c56a7a9be36ee9c3f7ea09957e726104b8 (diff)
downloadmariadb-git-b2a13dd760d844443b7aa86e8c35be3f7033b9f1.tar.gz
Merge bk-internal:/home/bk/mysql-5.1-new
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
Diffstat (limited to 'sql/share/errmsg.txt')
-rw-r--r--sql/share/errmsg.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index bf2443d9a6b..aa9cefd78b7 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -5806,3 +5806,5 @@ ER_COL_COUNT_DOESNT_MATCH_PLEASE_UPDATE
eng "Column count of mysql.%s is wrong. Expected %d, found %d. Created with MySQL %d, now running %d. Please use scripts/mysql_fix_privilege_tables"
ER_TABLE_NEEDS_UPGRADE
eng "Table upgrade required. Please do \"REPAIR TABLE `%-.32s`\" to fix it!"
+ER_ILLEGAL_HA_CREATE_OPTION
+ eng "Table storage engine '%-.64s' does not support the create option '%.64s'"