summaryrefslogtreecommitdiff
path: root/mysql-test/suite/gcol
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/suite/gcol
parentb0ff5a6a7393c057cd201aff63279e45d3e0cc49 (diff)
parent9cba6c5aa3b15fffc0ca10e92bcb55a126a20701 (diff)
downloadmariadb-git-a071e0e029cd7c155cff1054d9f7f8a6aa898620.tar.gz
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/suite/gcol')
-rw-r--r--mysql-test/suite/gcol/inc/gcol_select.inc37
1 files changed, 23 insertions, 14 deletions
diff --git a/mysql-test/suite/gcol/inc/gcol_select.inc b/mysql-test/suite/gcol/inc/gcol_select.inc
index efaffd5168d..1f54b2bb3ae 100644
--- a/mysql-test/suite/gcol/inc/gcol_select.inc
+++ b/mysql-test/suite/gcol/inc/gcol_select.inc
@@ -1,17 +1,22 @@
-################################################################################
-# inc/gcol_select.inc #
-# #
-# Purpose: #
-# Testing different SELECTs. #
-# #
-# #
-#------------------------------------------------------------------------------#
-# Original Author: Andrey Zhakov #
-# Original Date: 2008-09-18 #
-# Change Author: #
-# Change Date: #
-# Change: #
-################################################################################
+##############################################################################
+# inc/gcol_select.inc #
+# #
+# Purpose: #
+# Testing different SELECTs. #
+# #
+# #
+#----------------------------------------------------------------------------#
+# Original Author: Andrey Zhakov #
+# Original Date: 2008-09-18 #
+# Change Author: #
+# Change Date: #
+# Change: #
+##############################################################################
+
+--disable_query_log
+set @local_optimizer_switch=@@optimizer_switch;
+set optimizer_switch='derived_merge=off,join_cache_hashed=off';
+--enable_query_log
# Table t1 is used below to test:
# - Join type of ALL (sequential scan of the entire table)
@@ -1161,3 +1166,7 @@ eval EXPLAIN $query;
eval $query;
DROP TABLE t1, t2, t3, t4;
+
+--disable_query_log
+set @@optimizer_switch=@local_optimizer_switch;
+--enable_query_log