merge

sql/set_var.cc:
  Auto merged

include/mysqld_error.h

@@ -296,4 +296,5 @@
 #define ER_MISSING_SKIP_SLAVE 1277
 #define ER_UNTIL_COND_IGNORED 1278
 #define ER_WRONG_INDEX_NAME 1279
-#define ER_ERROR_MESSAGES 280
+#define ER_WARN_QC_RESIZE 1280
+#define ER_ERROR_MESSAGES 281

mysql-test/r/query_cache.result

@@ -579,24 +579,32 @@ query_cache_size	0
 select * from t1;
 a
 set GLOBAL query_cache_size=1024;
+Warnings:
+Warning	1279	Query cache failed to set size 1024, new query cache size is 0
 show global variables like "query_cache_size";
 Variable_name	Value
 query_cache_size	0
 select * from t1;
 a
 set GLOBAL query_cache_size=10240;
+Warnings:
+Warning	1279	Query cache failed to set size 10240, new query cache size is 0
 show global variables like "query_cache_size";
 Variable_name	Value
 query_cache_size	0
 select * from t1;
 a
 set GLOBAL query_cache_size=20480;
+Warnings:
+Warning	1279	Query cache failed to set size 20480, new query cache size is 0
 show global variables like "query_cache_size";
 Variable_name	Value
 query_cache_size	0
 select * from t1;
 a
 set GLOBAL query_cache_size=40960;
+Warnings:
+Warning	1279	Query cache failed to set size 40960, new query cache size is 0
 show global variables like "query_cache_size";
 Variable_name	Value
 query_cache_size	0

sql/set_var.cc

@@ -909,7 +909,12 @@ static void fix_net_retry_count(THD *thd __attribute__(unused),
 static void fix_query_cache_size(THD *thd, enum_var_type type)
 {
 #ifdef HAVE_QUERY_CACHE
+  ulong requested= query_cache_size;
   query_cache.resize(query_cache_size);
+  if (requested != query_cache_size)
+    push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
+			ER_WARN_QC_RESIZE, ER(ER_WARN_QC_RESIZE),
+			requested, query_cache_size);
 #endif
 }
 

sql/share/czech/errmsg.txt

@@ -292,3 +292,4 @@ character-set=latin2
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart"
 "SQL thread is not to be started so UNTIL options are ignored"
 "Incorrect index name '%-.100s'",
+"Query cache failed to set size %lu, new query cache size is %lu",

sql/share/danish/errmsg.txt

@@ -286,3 +286,4 @@ character-set=latin1
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart"
 "SQL thread is not to be started so UNTIL options are ignored"
 "Incorrect index name '%-.100s'",
+"Query cache failed to set size %lu, new query cache size is %lu",

sql/share/dutch/errmsg.txt

@@ -294,3 +294,4 @@ character-set=latin1
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart"
 "SQL thread is not to be started so UNTIL options are ignored"
 "Incorrect index name '%-.100s'",
+"Query cache failed to set size %lu, new query cache size is %lu",

sql/share/english/errmsg.txt

@@ -283,3 +283,4 @@ character-set=latin1
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart"
 "SQL thread is not to be started so UNTIL options are ignored"
 "Incorrect index name '%-.100s'",
+"Query cache failed to set size %lu, new query cache size is %lu",

sql/share/estonian/errmsg.txt

@@ -288,3 +288,4 @@ character-set=latin7
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart"
 "SQL thread is not to be started so UNTIL options are ignored"
 "Incorrect index name '%-.100s'",
+"Query cache failed to set size %lu, new query cache size is %lu",

sql/share/french/errmsg.txt

@@ -283,3 +283,4 @@ character-set=latin1
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart"
 "SQL thread is not to be started so UNTIL options are ignored"
 "Incorrect index name '%-.100s'",
+"Query cache failed to set size %lu, new query cache size is %lu",

sql/share/german/errmsg.txt

@@ -295,3 +295,4 @@ character-set=latin1
 "Es wird empfohlen, mit --skip-slave-start zu starten, wenn mit START SLAVE UNTIL eine Schritt-für-Schritt-Replikation ausgeführt wird. Ansonsten gibt es Probleme, wenn der Slave-Server unerwartet neu startet",
 "SQL-Thread soll nicht gestartet werden. Daher werden UNTIL-Optionen ignoriert"
 "Incorrect index name '%-.100s'",
+"Query cache failed to set size %lu, new query cache size is %lu",

sql/share/greek/errmsg.txt

@@ -283,3 +283,4 @@ character-set=greek
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart"
 "SQL thread is not to be started so UNTIL options are ignored"
 "Incorrect index name '%-.100s'",
+"Query cache failed to set size %lu, new query cache size is %lu",

sql/share/hungarian/errmsg.txt

@@ -285,3 +285,4 @@ character-set=latin2
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart"
 "SQL thread is not to be started so UNTIL options are ignored"
 "Incorrect index name '%-.100s'",
+"Query cache failed to set size %lu, new query cache size is %lu",

sql/share/italian/errmsg.txt

@@ -283,3 +283,4 @@ character-set=latin1
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart"
 "SQL thread is not to be started so UNTIL options are ignored"
 "Incorrect index name '%-.100s'",
+"Query cache failed to set size %lu, new query cache size is %lu",

sql/share/japanese/errmsg.txt

@@ -285,3 +285,4 @@ character-set=ujis
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart"
 "SQL thread is not to be started so UNTIL options are ignored"
 "Incorrect index name '%-.100s'",
+"Query cache failed to set size %lu, new query cache size is %lu",

sql/share/korean/errmsg.txt

@@ -283,3 +283,4 @@ character-set=euckr
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart"
 "SQL thread is not to be started so UNTIL options are ignored"
 "Incorrect index name '%-.100s'",
+"Query cache failed to set size %lu, new query cache size is %lu",

sql/share/norwegian-ny/errmsg.txt

@@ -285,3 +285,4 @@ character-set=latin1
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart"
 "SQL thread is not to be started so UNTIL options are ignored"
 "Incorrect index name '%-.100s'",
+"Query cache failed to set size %lu, new query cache size is %lu",

sql/share/norwegian/errmsg.txt

@@ -285,3 +285,4 @@ character-set=latin1
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart"
 "SQL thread is not to be started so UNTIL options are ignored"
 "Incorrect index name '%-.100s'",
+"Query cache failed to set size %lu, new query cache size is %lu",

sql/share/polish/errmsg.txt

@@ -287,3 +287,4 @@ character-set=latin2
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart"
 "SQL thread is not to be started so UNTIL options are ignored"
 "Incorrect index name '%-.100s'",
+"Query cache failed to set size %lu, new query cache size is %lu",

sql/share/portuguese/errmsg.txt

@@ -284,3 +284,4 @@ character-set=latin1
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart"
 "SQL thread is not to be started so UNTIL options are ignored"
 "Incorrect index name '%-.100s'",
+"Query cache failed to set size %lu, new query cache size is %lu",

sql/share/romanian/errmsg.txt

@@ -287,3 +287,4 @@ character-set=latin2
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart"
 "SQL thread is not to be started so UNTIL options are ignored"
 "Incorrect index name '%-.100s'",
+"Query cache failed to set size %lu, new query cache size is %lu",

sql/share/russian/errmsg.txt

@@ -285,3 +285,4 @@ character-set=koi8r
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart"
 "SQL thread is not to be started so UNTIL options are ignored"
 "Incorrect index name '%-.100s'",
+"      %lu,     - %lu",

sql/share/serbian/errmsg.txt

@@ -278,3 +278,4 @@ character-set=cp1250
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart"
 "SQL thread is not to be started so UNTIL options are ignored"
 "Incorrect index name '%-.100s'",
+"Query cache failed to set size %lu, new query cache size is %lu",

sql/share/slovak/errmsg.txt

@@ -291,3 +291,4 @@ character-set=latin2
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart"
 "SQL thread is not to be started so UNTIL options are ignored"
 "Incorrect index name '%-.100s'",
+"Query cache failed to set size %lu, new query cache size is %lu",

sql/share/spanish/errmsg.txt

@@ -285,3 +285,4 @@ character-set=latin1
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart"
 "SQL thread is not to be started so UNTIL options are ignored"
 "Incorrect index name '%-.100s'",
+"Query cache failed to set size %lu, new query cache size is %lu",

sql/share/swedish/errmsg.txt

@@ -283,3 +283,4 @@ character-set=latin1
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart"
 "SQL thread is not to be started so UNTIL options are ignored"
 "Incorrect index name '%-.100s'",
+"Query cache failed to set size %lu, new query cache size is %lu",

sql/share/ukrainian/errmsg.txt

@@ -288,3 +288,4 @@ character-set=koi8u
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart"
 "SQL thread is not to be started so UNTIL options are ignored"
 "Incorrect index name '%-.100s'",
+" Ԧ   ͦ %lu,  ͦ  Ԧ - %lu",