From a8577081ffde9ed2660907beedf61d9c682c590e Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 26 Oct 2003 22:01:00 +0200 Subject: [PATCH] after-merge fix --- mysql-test/r/query_cache.result | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result index 3a3a8d99348..1a1eec1f915 100644 --- a/mysql-test/r/query_cache.result +++ b/mysql-test/r/query_cache.result @@ -580,7 +580,7 @@ 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 +Warning 1280 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 @@ -588,7 +588,7 @@ 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 +Warning 1280 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 @@ -596,7 +596,7 @@ 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 +Warning 1280 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 @@ -604,7 +604,7 @@ 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 +Warning 1280 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