summaryrefslogtreecommitdiff
path: root/mysql-test/main/join_cache.test
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-10-13 10:05:29 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-10-13 10:05:29 +0300
commit588efca2374536aab956e6366f96082f2886c73c (patch)
treeaf1b126c795cd1255d7c7d72c201c01339119755 /mysql-test/main/join_cache.test
parentb6ebadaa66ee68b1880c0e10669543d1ba058c18 (diff)
parent1feccb505f9ec5cada8f8e2c544f736c1a533633 (diff)
downloadmariadb-git-588efca2374536aab956e6366f96082f2886c73c.tar.gz
Merge 10.6 into 10.7
Diffstat (limited to 'mysql-test/main/join_cache.test')
-rw-r--r--mysql-test/main/join_cache.test6
1 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/main/join_cache.test b/mysql-test/main/join_cache.test
index 4b659345db4..e31937efc1b 100644
--- a/mysql-test/main/join_cache.test
+++ b/mysql-test/main/join_cache.test
@@ -1,9 +1,11 @@
+--source include/no_valgrind_without_big.inc
+--source include/default_optimizer_switch.inc
+--source include/default_charset.inc
+
--disable_warnings
DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11;
DROP DATABASE IF EXISTS world;
--enable_warnings
---source include/default_optimizer_switch.inc
---source include/default_charset.inc
set @org_optimizer_switch=@@optimizer_switch;
set @save_join_cache_level=@@join_cache_level;