diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-30 22:37:52 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-30 22:37:52 +0300 |
| commit | d47d32bdb5d3ee4ae84b8bc999ff887b86949303 (patch) | |
| tree | 0487354aa3bff6639138fe70509f8eba60b31415 /sql/share/errmsg.txt | |
| parent | d03ebe4b7967522b751fa1aaa46fed34ee52e054 (diff) | |
| parent | 4a1b59b7ab1e09f23e82ec8274e5d1fa0c067b4f (diff) | |
| download | mariadb-git-d47d32bdb5d3ee4ae84b8bc999ff887b86949303.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- sql/mysqld.cc
- sql/sql_view.cc
- sql/sql_yacc.yy
Diffstat (limited to 'sql/share/errmsg.txt')
| -rw-r--r-- | sql/share/errmsg.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 4ee0cf9d758..ae4fc533d92 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -6274,7 +6274,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 |