summaryrefslogtreecommitdiff
path: root/mysql-test/suite/sys_vars/r/max_seeks_for_key_func.result
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2019-09-06 11:53:10 +0200
committerSergei Golubchik <serg@mariadb.org>2019-09-06 11:53:10 +0200
commit244f0e6dd815b388282c15db4fe7f15533f4c8fc (patch)
treeaf138f2b3739a742c0c38173cdc86ec176fc0edd /mysql-test/suite/sys_vars/r/max_seeks_for_key_func.result
parent18af13b88ba580562981a190c25da128a2e9db26 (diff)
parent2842c369851a8afc2a944ce6f4f60fa052f20969 (diff)
downloadmariadb-git-244f0e6dd815b388282c15db4fe7f15533f4c8fc.tar.gz
Merge branch '10.3' into 10.4
Diffstat (limited to 'mysql-test/suite/sys_vars/r/max_seeks_for_key_func.result')
-rw-r--r--mysql-test/suite/sys_vars/r/max_seeks_for_key_func.result10
1 files changed, 4 insertions, 6 deletions
diff --git a/mysql-test/suite/sys_vars/r/max_seeks_for_key_func.result b/mysql-test/suite/sys_vars/r/max_seeks_for_key_func.result
index f833f417290..f6468fd8a7a 100644
--- a/mysql-test/suite/sys_vars/r/max_seeks_for_key_func.result
+++ b/mysql-test/suite/sys_vars/r/max_seeks_for_key_func.result
@@ -1,3 +1,5 @@
+set @@global.optimizer_switch=@@local.optimizer_switch;
+set @@global.join_cache_level=@@local.join_cache_level;
DROP TABLE IF EXISTS t1;
CREATE TABLE t1
(a INT AUTO_INCREMENT PRIMARY KEY,
@@ -7,12 +9,6 @@ SET @start_value= @@global.max_seeks_for_key;
'#--------------------FN_DYNVARS_084_01-------------------------#'
CONNECT test_con1,localhost,root,,;
connection test_con1;
-SELECT @@global.max_seeks_for_key = 10;
-@@global.max_seeks_for_key = 10
-0
-SELECT @@session.max_seeks_for_key = 10;
-@@session.max_seeks_for_key = 10
-0
SET @@global.max_seeks_for_key = 20;
SELECT @@global.max_seeks_for_key;
@@global.max_seeks_for_key
@@ -83,3 +79,5 @@ disconnect test_con1;
disconnect test_con2;
DROP TABLE t1;
SET @@global.max_seeks_for_key= @start_value;
+SET @@global.optimizer_switch= @save_optimizer_switch;
+SET @@global.join_cache_level=  @save_join_cache_level;