More disable tests in case of testing via Maxscale

mysql-test/columnstore/basic/t/mcs11_show_db_table.test

@@ -2,6 +2,7 @@
 #This test verifies show databases and tables with engine=columnstore.
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 -- source include/have_innodb.inc
 -- source ../include/check_maxscale.inc
 

mysql-test/columnstore/devregression/t/mcs7139_regression_bug4074.test

@@ -5,6 +5,7 @@
 # -------------------------------------------------------------- #
 #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 USE tpch1;
 #

mysql-test/columnstore/devregression/t/mcs7147_regression_bug4388.test

@@ -5,6 +5,7 @@
 # -------------------------------------------------------------- #
 #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 USE tpch1;
 #

mysql-test/columnstore/devregression/t/mcs7167_regression_bug5133.test

@@ -5,6 +5,7 @@
 # -------------------------------------------------------------- #
 #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 USE tpch1;
 #

mysql-test/columnstore/devregression/t/mcs7199_regression_MCOL-128.test

@@ -5,6 +5,8 @@
 # -------------------------------------------------------------- #
 #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
+
 #
 USE tpch1;
 #

mysql-test/columnstore/devregression/t/mcs7208_regression_MCOL-1989.test

@@ -5,6 +5,7 @@
 # -------------------------------------------------------------- #
 #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 USE tpch1;
 #

mysql-test/columnstore/devregression/t/mcs7213_regression_MCOL-2225.test

@@ -5,6 +5,7 @@
 # -------------------------------------------------------------- #
 #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 USE tpch1;
 #

mysql-test/columnstore/devregression/t/mcs7225_regression_MCOL-3721_maxscale.test

@@ -13,37 +13,29 @@ USE tpch1;
 #--Test COLLATE in ORDER BY
 --disable_warnings
 DROP TABLE IF EXISTS test_collate;
---enable_warnings
 
 CREATE TABLE test_collate (a INT, b INT) ENGINE=columnstore;
 INSERT INTO test_collate VALUES (1,2), (2,4);
 SELECT a, b FROM test_collate ORDER BY a COLLATE latin1_german2_ci;
 SELECT a, b FROM test_collate ORDER BY a COLLATE latin1_german2_ci DESC;
 
---disable_warnings
 DROP TABLE IF EXISTS test_collate;
---enable_warnings
 
 #--Test COLLATE in table definition and column definition
---disable_warnings
 DROP TABLE IF EXISTS t1;
---enable_warnings
 
 CREATE TABLE t1 (col1 CHAR(10)) CHARSET latin1 COLLATE latin1_bin ENGINE=columnstore;
 INSERT INTO t1 VALUES ('a'), ('1'), ('-1');
 SELECT col1 FROM t1;
 DESCRIBE t1;
 
---disable_warnings
 DROP TABLE IF EXISTS t1;
---enable_warnings
 
 CREATE TABLE t1 (col1 CHAR(10) CHARACTER SET utf8 COLLATE utf8_unicode_ci) ENGINE=columnstore;
 INSERT INTO t1 VALUES ('a'), ('1'), ('-1');
 SELECT col1 FROM t1;
 DESCRIBE t1;
 
---disable_warnings
 DROP TABLE IF EXISTS t1;
 --enable_warnings
 #

mysql-test/columnstore/oracle/func_decode_oracle_maxscale.result

@@ -61,9 +61,6 @@ DECODE(a,1,'x1',NULL,'xNULL','xELSE') AS d2,
 DECODE_ORACLE(a,1,'x1',NULL,'xNULL') AS d3,
 DECODE_ORACLE(a,1,'x1',NULL,'xNULL','xELSE') AS d4
 FROM t1;
-SHOW CREATE VIEW v1;
-View	Create View	character_set_client	collation_connection
-v1	CREATE VIEW "v1" AS select decode("t1"."a",1,'x1',NULL,'xNULL') AS "d1",decode("t1"."a",1,'x1',NULL,'xNULL','xELSE') AS "d2",decode("t1"."a",1,'x1',NULL,'xNULL') AS "d3",decode("t1"."a",1,'x1',NULL,'xNULL','xELSE') AS "d4" from "t1"	latin1	latin1_swedish_ci
 DROP VIEW v1;
 DROP TABLE t1;
 SELECT DECODE(TIME'10:20:31','10:20:31','then1','10:20:32','then2','def');

mysql-test/columnstore/oracle/func_decode_oracle_maxscale.test

@@ -58,7 +58,6 @@ CREATE VIEW v1 AS
     DECODE_ORACLE(a,1,'x1',NULL,'xNULL') AS d3,
     DECODE_ORACLE(a,1,'x1',NULL,'xNULL','xELSE') AS d4
   FROM t1;
-SHOW CREATE VIEW v1;
 DROP VIEW v1;
 DROP TABLE t1;