diff options
| author | unknown <sanja@askmonty.org> | 2011-05-18 16:27:19 +0300 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2011-05-18 16:27:19 +0300 |
| commit | 1177bea2f1cd0c9f887670b65c9a403a26f07d76 (patch) | |
| tree | 86c61cd5b446c4e6a3fc89470b3e35e806d99924 /sql/share | |
| parent | 0da2df248ba5915630d04e7b7335bea409670cd6 (diff) | |
| download | mariadb-git-1177bea2f1cd0c9f887670b65c9a403a26f07d76.tar.gz | |
Rewritten patch of percona - switching query cache on and off, removing comments.
client/mysqltest.cc:
Column names.
mysql-test/r/grant_cache_no_prot.result:
fix of text.
mysql-test/r/grant_cache_ps_prot.result:
Fix of test.
mysql-test/r/query_cache.result:
Switching on and off query cache.
mysql-test/t/query_cache.test:
Switching on and off query cache.
mysys/charset.c:
Fix of parser.
sql/handler.cc:
thd added to parameters.
sql/log_event.cc:
thd added to parameters.
sql/log_event_old.cc:
thd added to parameters.
sql/mysql_priv.h:
Fixed functions definitions.
sql/mysqld.cc:
Comments stripping.
sql/set_var.cc:
Switching on and off query cache.
sql/set_var.h:
Switching on and off query cache.
sql/share/errmsg.txt:
New errors.
sql/sql_cache.cc:
Switching query cache on and off, removing comments.
sql/sql_cache.h:
thd added to parameters.
sql/sql_class.h:
Comments stripping.
sql/sql_db.cc:
thd added to parameters.
sql/sql_lex.cc:
lex fixed.
sql/sql_parse.cc:
thd added to parameters.
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 547d9bdf0be..9df84ad4283 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -6271,3 +6271,7 @@ ER_DYN_COL_WRONG_CHARSET eng "Dynamic column contains unknown character set" ER_ILLEGAL_SUBQUERY_OPTIMIZER_SWITCHES eng "At least one of the 'in_to_exists' or 'materialization' optimizer_switch flags must be 'on'." +ER_QUERY_CACHE_IS_DISABLED + eng "Query cache is disabled (resize or similar command in progress); repeat this command later" +ER_QUERY_CACHE_IS_GLOBALY_DISABLED + eng "Query cache is globally disabled and you can't enable it only for this session" |