From 9cba6c5aa3b15fffc0ca10e92bcb55a126a20701 Mon Sep 17 00:00:00 2001
From: Monty <monty@mariadb.org>
Date: Fri, 30 Aug 2019 16:06:54 +0300
Subject: Updated mtr files to support different compiled in options

This allows one to run the test suite even if any of the following
options are changed:
- character-set-server
- collation-server
- join-cache-level
- log-basename
- max-allowed-packet
- optimizer-switch
- query-cache-size and query-cache-type
- skip-name-resolve
- table-definition-cache
- table-open-cache
- Some innodb options
etc

Changes:
- Don't print out the value of system variables as one can't depend on
  them to being constants.
- Don't set global variables to 'default' as the default may not
  be the same as the test was started with if there was an additional
  option file. Instead save original value and reset it at end of test.
- Test that depends on the latin1 character set should include
  default_charset.inc or set the character set to latin1
- Test that depends on the original optimizer switch, should include
  default_optimizer_switch.inc
- Test that depends on the value of a specific system variable should
  set it in the test (like optimizer_use_condition_selectivity)
- Split subselect3.test into subselect3.test and subselect3.inc to
  make it easier to set and reset system variables.
- Added .opt files for test that required specfic options that could
  be changed by external configuration files.
- Fixed result files in rockdsb & tokudb that had not been updated for
  a while.
---
 mysql-test/suite/gcol/inc/gcol_select.inc | 37 +++++++++++++++++++------------
 1 file changed, 23 insertions(+), 14 deletions(-)

(limited to 'mysql-test/suite/gcol')

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
-- 
cgit v1.2.1