summaryrefslogtreecommitdiff
path: root/mysql-test/main/xtradb_mrr.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-09-06 17:16:40 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-09-06 17:16:40 +0300
commit4081b7b27a40df6244e0525885cf70e48b7b35bc (patch)
treee9e6199730603d05090e0550e023e92c7a32f88d /mysql-test/main/xtradb_mrr.result
parent780d2bb8a7eca4fdbdf70fbd51c0bdbae5b0057e (diff)
parent244f0e6dd815b388282c15db4fe7f15533f4c8fc (diff)
downloadmariadb-git-4081b7b27a40df6244e0525885cf70e48b7b35bc.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/main/xtradb_mrr.result')
-rw-r--r--mysql-test/main/xtradb_mrr.result1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/main/xtradb_mrr.result b/mysql-test/main/xtradb_mrr.result
index 383d04207af..2f18a7c287f 100644
--- a/mysql-test/main/xtradb_mrr.result
+++ b/mysql-test/main/xtradb_mrr.result
@@ -742,6 +742,7 @@ count(*) sum(table1.col_int_key*table2.pk)
drop table t1,t2;
set join_cache_level=@my_save_join_cache_level;
set join_buffer_size=@my_save_join_buffer_size;
+set optimizer_switch=@save_optimizer_switch;
#
# BUG#665669: Result differences on query re-execution
#