fix broken result file

98fbaacb · Vladislav Vaintroub · 9c24a1e8 · 98fbaacb
Commit 98fbaacb authored Jan 19, 2012 by Vladislav Vaintroub
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 10 deletions

mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result +0 -10

No files found.
--- 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;