summaryrefslogtreecommitdiff
path: root/mysql-test/main/func_misc.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/func_misc.test
parentb0ff5a6a7393c057cd201aff63279e45d3e0cc49 (diff)
parent9cba6c5aa3b15fffc0ca10e92bcb55a126a20701 (diff)
downloadmariadb-git-a071e0e029cd7c155cff1054d9f7f8a6aa898620.tar.gz
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/main/func_misc.test')
-rw-r--r--mysql-test/main/func_misc.test1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/main/func_misc.test b/mysql-test/main/func_misc.test
index e4a2cd22f69..580245ef5c7 100644
--- a/mysql-test/main/func_misc.test
+++ b/mysql-test/main/func_misc.test
@@ -2,6 +2,7 @@
# Testing of misc functions
#
+--source include/default_optimizer_switch.inc
--disable_warnings
DROP TABLE IF EXISTS t1, t2;
--enable_warnings