database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '10.2' into 10.3

Browse Source
This commit is contained in:
Monty
2019-09-02 14:06:56 +03:00
parent b0ff5a6a73 9cba6c5aa3
commit a071e0e029
671 changed files with 11116 additions and 14190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/main/query_cache_notembedded.test
View File

@ -4,7 +4,6 @@
# Save the initial number of concurrent sessions
--source include/count_sessions.inc
#
# Tests with query cache
#
@ -277,9 +276,7 @@ DROP USER 'bug30269'@'localhost';
set GLOBAL query_cache_type=ON;
set LOCAL query_cache_type=ON;
set GLOBAL query_cache_limit=default;
set GLOBAL query_cache_min_res_unit=default;
set GLOBAL query_cache_size=default;
set GLOBAL query_cache_size=@query_cache_size_save;
#
# Bug#3583 query cache doesn't work for stored procedures
@ -333,4 +330,3 @@ delimiter ;|
SET GLOBAL query_cache_size=@query_cache_size_save;
SET GLOBAL query_cache_type=@query_cache_type_save;
set GLOBAL sql_mode=@sql_mode_save;