summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-01-16 21:06:23 +0100
committerSergei Golubchik <sergii@pisem.net>2012-01-16 21:06:23 +0100
commit2ec0f46b88bc5f1d565d65025b7a868c6943ab0c (patch)
treede28d5051f89c5f6d6592d955b4e4f8498cecc44 /sql/share
parentbaca1a40e98c4d1ac107118f5f4b6012f398bdf2 (diff)
downloadmariadb-git-2ec0f46b88bc5f1d565d65025b7a868c6943ab0c.tar.gz
query cache sysvar fixes
sql/share/errmsg-utf8.txt: correct the error message, as query_cache_type variable is not read-ony anymore sql/sql_cache.cc: the caller should verify that query cache resize is possible, before trying it sql/sys_vars.cc: * test if qc resize is possible in the sysvar on_check() funntion, not in the on_update() function. * use the error message that better describes the problem
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg-utf8.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index 4798483860c..872e80ab542 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -6270,8 +6270,7 @@ ER_SLAVE_IGNORE_SERVER_IDS
eng "The requested server id %d clashes with the slave startup option --replicate-same-server-id"
ger "Die angeforderte Server-ID %d steht im Konflikt mit der Startoption --replicate-same-server-id für den Slave"
ER_QUERY_CACHE_DISABLED
- eng "Query cache is disabled; restart the server with query_cache_type=1 to enable it"
- ger "Abfragen-Cache ist deaktiviert. Starten Sie den Server neu mit query_cache_type=1, um ihn zu aktivieren"
+ eng "Query cache is disabled; set query_cache_type to ON or DEMAND to enable it"
ER_SAME_NAME_PARTITION_FIELD
eng "Duplicate partition field name '%-.192s'"
ger "Partitionsfeld '%-.192s' ist ein Duplikat"