From 7fd29de377b02f79204bbff04da939cf63d88fe0 Mon Sep 17 00:00:00 2001 From: Timofey Turenko Date: Tue, 10 Jun 2025 18:42:42 +0300 Subject: [PATCH] More disable tests in case of testing via Maxscale --- mysql-test/columnstore/basic/t/mcs11_show_db_table.test | 1 + .../devregression/t/mcs7139_regression_bug4074.test | 1 + .../devregression/t/mcs7147_regression_bug4388.test | 1 + .../devregression/t/mcs7167_regression_bug5133.test | 1 + .../devregression/t/mcs7199_regression_MCOL-128.test | 2 ++ .../devregression/t/mcs7208_regression_MCOL-1989.test | 1 + .../devregression/t/mcs7213_regression_MCOL-2225.test | 1 + .../t/mcs7225_regression_MCOL-3721_maxscale.test | 8 -------- .../columnstore/oracle/func_decode_oracle_maxscale.result | 3 --- .../columnstore/oracle/func_decode_oracle_maxscale.test | 1 - 10 files changed, 8 insertions(+), 12 deletions(-) diff --git a/mysql-test/columnstore/basic/t/mcs11_show_db_table.test b/mysql-test/columnstore/basic/t/mcs11_show_db_table.test index 2d90ca47d..f5469d63d 100644 --- a/mysql-test/columnstore/basic/t/mcs11_show_db_table.test +++ b/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 diff --git a/mysql-test/columnstore/devregression/t/mcs7139_regression_bug4074.test b/mysql-test/columnstore/devregression/t/mcs7139_regression_bug4074.test index 60bdc4486..817d6637a 100644 --- a/mysql-test/columnstore/devregression/t/mcs7139_regression_bug4074.test +++ b/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; # diff --git a/mysql-test/columnstore/devregression/t/mcs7147_regression_bug4388.test b/mysql-test/columnstore/devregression/t/mcs7147_regression_bug4388.test index e2f549960..17250b722 100644 --- a/mysql-test/columnstore/devregression/t/mcs7147_regression_bug4388.test +++ b/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; # diff --git a/mysql-test/columnstore/devregression/t/mcs7167_regression_bug5133.test b/mysql-test/columnstore/devregression/t/mcs7167_regression_bug5133.test index 2241f7939..863c31205 100644 --- a/mysql-test/columnstore/devregression/t/mcs7167_regression_bug5133.test +++ b/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; # diff --git a/mysql-test/columnstore/devregression/t/mcs7199_regression_MCOL-128.test b/mysql-test/columnstore/devregression/t/mcs7199_regression_MCOL-128.test index 1991ca0b1..f2f02c163 100644 --- a/mysql-test/columnstore/devregression/t/mcs7199_regression_MCOL-128.test +++ b/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; # diff --git a/mysql-test/columnstore/devregression/t/mcs7208_regression_MCOL-1989.test b/mysql-test/columnstore/devregression/t/mcs7208_regression_MCOL-1989.test index 9a7c378e0..e6fc02913 100644 --- a/mysql-test/columnstore/devregression/t/mcs7208_regression_MCOL-1989.test +++ b/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; # diff --git a/mysql-test/columnstore/devregression/t/mcs7213_regression_MCOL-2225.test b/mysql-test/columnstore/devregression/t/mcs7213_regression_MCOL-2225.test index 88f9f30b5..b08809f75 100644 --- a/mysql-test/columnstore/devregression/t/mcs7213_regression_MCOL-2225.test +++ b/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; # diff --git a/mysql-test/columnstore/devregression/t/mcs7225_regression_MCOL-3721_maxscale.test b/mysql-test/columnstore/devregression/t/mcs7225_regression_MCOL-3721_maxscale.test index fe93e2705..64443034d 100644 --- a/mysql-test/columnstore/devregression/t/mcs7225_regression_MCOL-3721_maxscale.test +++ b/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 # diff --git a/mysql-test/columnstore/oracle/func_decode_oracle_maxscale.result b/mysql-test/columnstore/oracle/func_decode_oracle_maxscale.result index 61890127d..0937dddf6 100644 --- a/mysql-test/columnstore/oracle/func_decode_oracle_maxscale.result +++ b/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'); diff --git a/mysql-test/columnstore/oracle/func_decode_oracle_maxscale.test b/mysql-test/columnstore/oracle/func_decode_oracle_maxscale.test index bef5cac4b..c55328620 100644 --- a/mysql-test/columnstore/oracle/func_decode_oracle_maxscale.test +++ b/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;