summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorMikael Ronstrom <mikael@mysql.com>2009-11-03 12:37:02 +0100
committerMikael Ronstrom <mikael@mysql.com>2009-11-03 12:37:02 +0100
commit092cf82871a783286033c19193d64c23d975a615 (patch)
tree850f4bb2579f83fce380d670e77b4af5532c6bfd /sql/share
parent9c825ffc78a9dc847ef5d103cc85e0295811161f (diff)
parentbb5efb2c4bb612d3a548344ae4e41d5828956e2e (diff)
downloadmariadb-git-092cf82871a783286033c19193d64c23d975a615.tar.gz
Merge
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg-utf8.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index 0784370bbd3..4260efdeb56 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -6240,6 +6240,8 @@ ER_UNKNOWN_LOCALE
ER_SLAVE_IGNORE_SERVER_IDS
eng "The requested server id %d clashes with the slave startup option --replicate-same-server-id"
+ER_QUERY_CACHE_DISABLED
+ eng "Query cache is disabled; restart the server with query_cache_type=1 to enable it"
ER_SAME_NAME_PARTITION_FIELD
eng "Duplicate partition field name '%-.192s'"
ER_PARTITION_COLUMN_LIST_ERROR