From 3482963ad6f438f40388f36b697f227a733405a4 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Thu, 19 Jan 2012 17:44:22 +0100 Subject: [PATCH] fix broken result file --- .../suite/sys_vars/r/query_cache_size_basic_32.result | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result b/mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result index ef302c500d5..319948deefa 100644 --- a/mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result +++ b/mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result @@ -69,16 +69,6 @@ Warning 1292 Truncated incorrect query_cache_size value: '-1024' SELECT @@global.query_cache_size; @@global.query_cache_size 0 -<<<<<<< TREE -SET @@global.query_cache_size = 42949672950; -Warnings: -Warning 1292 Truncated incorrect query_cache_size value: '42949672950' -Warning 1282 Query cache failed to set size 4294966272; new query cache size is 0 -SELECT @@global.query_cache_size; -@@global.query_cache_size -0 -======= ->>>>>>> MERGE-SOURCE SET @@global.query_cache_size = ON; ERROR 42000: Incorrect argument type to variable 'query_cache_size' SELECT @@global.query_cache_size;