summaryrefslogtreecommitdiff
path: root/mysql-test/main/selectivity_innodb.test
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2019-09-02 14:06:56 +0300
committerMonty <monty@mariadb.org>2019-09-03 13:17:32 +0300
commita071e0e029cd7c155cff1054d9f7f8a6aa898620 (patch)
treeb592c10cb8ca3036688ea19039208eadd485fe7c /mysql-test/main/selectivity_innodb.test
parentb0ff5a6a7393c057cd201aff63279e45d3e0cc49 (diff)
parent9cba6c5aa3b15fffc0ca10e92bcb55a126a20701 (diff)
downloadmariadb-git-a071e0e029cd7c155cff1054d9f7f8a6aa898620.tar.gz
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/main/selectivity_innodb.test')
-rw-r--r--mysql-test/main/selectivity_innodb.test2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/main/selectivity_innodb.test b/mysql-test/main/selectivity_innodb.test
index f407eb052fe..6c457e2848b 100644
--- a/mysql-test/main/selectivity_innodb.test
+++ b/mysql-test/main/selectivity_innodb.test
@@ -1,6 +1,7 @@
--source include/have_innodb.inc
# This test is slow on buildbot.
--source include/big_test.inc
+--source include/default_optimizer_switch.inc
SET SESSION STORAGE_ENGINE='InnoDB';
@@ -175,4 +176,5 @@ drop view v1;
set use_stat_tables= @tmp_ust;
set optimizer_use_condition_selectivity= @tmp_oucs;
+set @@global.histogram_size=@save_histogram_size;
SET SESSION STORAGE_ENGINE=DEFAULT;