mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-01 20:55:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix broken result file

Browse source
This commit is contained in:
Vladislav Vaintroub 2012-01-19 17:44:22 +01:00
commit 3482963ad6
1 changed files with 0 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result
View file

@ -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;