1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Merge branch '10.2' into 10.3

This commit is contained in:
Monty
2019-09-02 14:06:56 +03:00
671 changed files with 11116 additions and 14190 deletions

View File

@ -4,6 +4,9 @@
--source include/long_test.inc
set global query_cache_type= ON;
set @save_query_cache_size=@@global.query_cache_size;
SET @save_concurrent_insert= @@GLOBAL.concurrent_insert;
#
# Bug #30887 Server crashes on SET GLOBAL query_cache_size=0
#
@ -53,9 +56,6 @@ drop table t1;
# Bug#41098: Query Cache returns wrong result with concurrent insert
#
SET @old_concurrent_insert= @@GLOBAL.concurrent_insert;
SET @old_query_cache_size= @@GLOBAL.query_cache_size;
--disable_warnings
DROP TABLE IF EXISTS t1, t2;
--enable_warnings
@ -247,8 +247,6 @@ SET GLOBAL query_cache_type= DEFAULT;
--echo # Bug#56822: Add a thread state for sessions waiting on the query cache lock
--echo #
SET @old_query_cache_size= @@GLOBAL.query_cache_size;
--disable_warnings
DROP TABLE IF EXISTS t1;
--enable_warnings
@ -297,7 +295,7 @@ connection default;
SET DEBUG_SYNC= 'RESET';
RESET QUERY CACHE;
DROP TABLE t1;
SET GLOBAL query_cache_size= DEFAULT;
SET GLOBAL query_cache_size= @save_query_cache_size;
SET GLOBAL query_cache_type= DEFAULT;
--echo #
@ -322,16 +320,13 @@ SET GLOBAL query_cache_type= 1;
--connect (con2,localhost,root,,test)
--connect (con1,localhost,root,,test)
set debug_sync="wait_in_query_cache_store_query SIGNAL parked WAIT_FOR go";
--send
SELECT DISTINCT id FROM t1 WHERE id BETWEEN 5603 AND 16218 ORDER BY k;
--send SELECT DISTINCT id FROM t1 WHERE id BETWEEN 5603 AND 16218 ORDER BY k
--connection default
set debug_sync="now WAIT_FOR parked";
--connection con2
--send
SET GLOBAL query_cache_type= 0;
--send SET GLOBAL query_cache_type= 0;
--connection default
set debug_sync="now SIGNAL go";
@ -347,7 +342,8 @@ set debug_sync="now SIGNAL go";
--connection default
set debug_sync= 'RESET';
DROP TABLE t1;
SEt GLOBAL query_cache_size= DEFAULT;
SEt GLOBAL query_cache_type= DEFAULT;
SET GLOBAL query_cache_size=@save_query_cache_size;
SET GLOBAL query_cache_type= DEFAULT;
SET @@GLOBAL.concurrent_insert=@save_concurrent_insert;
--echo # End of 5.5 tests