diff --git a/mysql-test/columnstore/autopilot/t/mcs6721_json_JSON_ARRAY.test b/mysql-test/columnstore/autopilot/t/mcs6721_json_JSON_ARRAY.test index 1670af8ef..c0a196da9 100644 --- a/mysql-test/columnstore/autopilot/t/mcs6721_json_JSON_ARRAY.test +++ b/mysql-test/columnstore/autopilot/t/mcs6721_json_JSON_ARRAY.test @@ -5,6 +5,7 @@ # -------------------------------------------------------------- # # --source ../include/have_columnstore.inc +--source ../include/detect_maxscale.inc # USE autopilot; # diff --git a/mysql-test/columnstore/basic/r/MCOL-5744-utf8-in-ddl_maxscale.result b/mysql-test/columnstore/basic/r/MCOL-5744-utf8-in-ddl_maxscale.result new file mode 100644 index 000000000..0d59e20a1 --- /dev/null +++ b/mysql-test/columnstore/basic/r/MCOL-5744-utf8-in-ddl_maxscale.result @@ -0,0 +1,19 @@ +DROP DATABASE IF EXISTS MCOL5744; +CREATE DATABASE MCOL5744; +SET old_mode=''; +CREATE TABLE t(x text CHARACTER SET utf8 COLLATE utf8_general_ci) ENGINE=COLUMNSTORE; +SHOW CREATE TABLE t; +Table Create Table +t CREATE TABLE `t` ( + `x` text DEFAULT NULL +) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +DROP TABLE t; +SET old_mode='UTF8_IS_UTF8MB3'; +CREATE TABLE t(x text CHARACTER SET utf8 COLLATE utf8_general_ci) ENGINE=COLUMNSTORE; +SHOW CREATE TABLE t; +Table Create Table +t CREATE TABLE `t` ( + `x` text DEFAULT NULL +) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +DROP TABLE t; +DROP DATABASE MCOL5744; diff --git a/mysql-test/columnstore/basic/t/MCOL-5744-utf8-in-ddl.test b/mysql-test/columnstore/basic/t/MCOL-5744-utf8-in-ddl.test index a8d0eb9a5..60713bdc3 100644 --- a/mysql-test/columnstore/basic/t/MCOL-5744-utf8-in-ddl.test +++ b/mysql-test/columnstore/basic/t/MCOL-5744-utf8-in-ddl.test @@ -1,3 +1,6 @@ +--source ../include/have_columnstore.inc +--source ../include/detect_maxscale.inc + --disable_warnings DROP DATABASE IF EXISTS MCOL5744; --enable_warnings diff --git a/mysql-test/columnstore/basic/t/MCOL-5744-utf8-in-ddl_maxscale.test b/mysql-test/columnstore/basic/t/MCOL-5744-utf8-in-ddl_maxscale.test new file mode 100644 index 000000000..4fc349088 --- /dev/null +++ b/mysql-test/columnstore/basic/t/MCOL-5744-utf8-in-ddl_maxscale.test @@ -0,0 +1,22 @@ +--source ../include/have_columnstore.inc +--source ../include/detect_no_maxscale.inc + +--disable_warnings +DROP DATABASE IF EXISTS MCOL5744; +--enable_warnings + +CREATE DATABASE MCOL5744; + +SET old_mode=''; + +CREATE TABLE t(x text CHARACTER SET utf8 COLLATE utf8_general_ci) ENGINE=COLUMNSTORE; +SHOW CREATE TABLE t; +DROP TABLE t; + +SET old_mode='UTF8_IS_UTF8MB3'; + +CREATE TABLE t(x text CHARACTER SET utf8 COLLATE utf8_general_ci) ENGINE=COLUMNSTORE; +SHOW CREATE TABLE t; +DROP TABLE t; + +DROP DATABASE MCOL5744; diff --git a/mysql-test/columnstore/basic/t/ctype_cmp_char1_latin1_swedish_ci.test b/mysql-test/columnstore/basic/t/ctype_cmp_char1_latin1_swedish_ci.test index 01d1ca583..b81d5cd7e 100644 --- a/mysql-test/columnstore/basic/t/ctype_cmp_char1_latin1_swedish_ci.test +++ b/mysql-test/columnstore/basic/t/ctype_cmp_char1_latin1_swedish_ci.test @@ -1,4 +1,5 @@ --source ../include/have_columnstore.inc +--source ../include/detect_maxscale.inc --source ctype_cmp_combinations.inc --source ctype_cmp_create.inc diff --git a/mysql-test/columnstore/basic/t/func_sec_to_time.test b/mysql-test/columnstore/basic/t/func_sec_to_time.test index e9524a639..e51506658 100644 --- a/mysql-test/columnstore/basic/t/func_sec_to_time.test +++ b/mysql-test/columnstore/basic/t/func_sec_to_time.test @@ -1,4 +1,5 @@ --source ../include/have_columnstore.inc +--source ../include/detect_maxscale.inc --source ../include/combinations.myisam-columnstore.inc --echo # diff --git a/mysql-test/columnstore/devregression/r/mcs7225_regression_MCOL-3721_maxscale.result b/mysql-test/columnstore/devregression/r/mcs7225_regression_MCOL-3721_maxscale.result index 04cce6a8b..ff5650ed4 100644 --- a/mysql-test/columnstore/devregression/r/mcs7225_regression_MCOL-3721_maxscale.result +++ b/mysql-test/columnstore/devregression/r/mcs7225_regression_MCOL-3721_maxscale.result @@ -6,15 +6,10 @@ SELECT a, b FROM test_collate ORDER BY a COLLATE latin1_german2_ci; a b 1 2 2 4 -SHOW WARNINGS; -Level Code Message -Note 1618 COLLATE is ignored in ColumnStore SELECT a, b FROM test_collate ORDER BY a COLLATE latin1_german2_ci DESC; a b 1 2 2 4 -SHOW WARNINGS; -Level Code Message DROP TABLE IF EXISTS test_collate; DROP TABLE IF EXISTS t1; CREATE TABLE t1 (col1 CHAR(10)) CHARSET latin1 COLLATE latin1_bin ENGINE=columnstore; diff --git a/mysql-test/columnstore/devregression/t/mcs7062_regression_bug3274.test b/mysql-test/columnstore/devregression/t/mcs7062_regression_bug3274.test index ed3088efa..e64cabda8 100644 --- a/mysql-test/columnstore/devregression/t/mcs7062_regression_bug3274.test +++ b/mysql-test/columnstore/devregression/t/mcs7062_regression_bug3274.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/mcs7132_regression_bug3952.test b/mysql-test/columnstore/devregression/t/mcs7132_regression_bug3952.test index ff93cabc9..8010fffa5 100644 --- a/mysql-test/columnstore/devregression/t/mcs7132_regression_bug3952.test +++ b/mysql-test/columnstore/devregression/t/mcs7132_regression_bug3952.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/mcs7168_regression_bug5173.test b/mysql-test/columnstore/devregression/t/mcs7168_regression_bug5173.test index 4f3ba58d6..1267679c7 100644 --- a/mysql-test/columnstore/devregression/t/mcs7168_regression_bug5173.test +++ b/mysql-test/columnstore/devregression/t/mcs7168_regression_bug5173.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 d375f8f35..fe93e2705 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 @@ -18,9 +18,7 @@ DROP TABLE IF EXISTS test_collate; 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; -SHOW WARNINGS; SELECT a, b FROM test_collate ORDER BY a COLLATE latin1_german2_ci DESC; -SHOW WARNINGS; --disable_warnings DROP TABLE IF EXISTS test_collate; diff --git a/mysql-test/columnstore/devregression/t/mcs7236_regression_MCOL-736.test b/mysql-test/columnstore/devregression/t/mcs7236_regression_MCOL-736.test index 4aa7a1d53..dd534dfe8 100644 --- a/mysql-test/columnstore/devregression/t/mcs7236_regression_MCOL-736.test +++ b/mysql-test/columnstore/devregression/t/mcs7236_regression_MCOL-736.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/mcs7522_storedProcedures_sp_autoswitch.test b/mysql-test/columnstore/devregression/t/mcs7522_storedProcedures_sp_autoswitch.test index 79499751f..d5750d20d 100644 --- a/mysql-test/columnstore/devregression/t/mcs7522_storedProcedures_sp_autoswitch.test +++ b/mysql-test/columnstore/devregression/t/mcs7522_storedProcedures_sp_autoswitch.test @@ -6,6 +6,7 @@ # -- source ../include/have_columnstore.inc +--source ../include/detect_maxscale.inc USE tpch1; diff --git a/mysql-test/columnstore/oracle/func_replace_oracle.test b/mysql-test/columnstore/oracle/func_replace_oracle.test index dbc43da92..d66f5437e 100644 --- a/mysql-test/columnstore/oracle/func_replace_oracle.test +++ b/mysql-test/columnstore/oracle/func_replace_oracle.test @@ -2,6 +2,10 @@ # Testing replace with null args # +--source ../include/have_columnstore.inc +--source ../include/detect_maxscale.inc + + SET sql_mode=ORACLE; SET default_storage_engine=ColumnStore; --echo # diff --git a/mysql-test/columnstore/oracle/func_replace_oracle_maxscale.result b/mysql-test/columnstore/oracle/func_replace_oracle_maxscale.result new file mode 100644 index 000000000..0f5bd66e8 --- /dev/null +++ b/mysql-test/columnstore/oracle/func_replace_oracle_maxscale.result @@ -0,0 +1,31 @@ +SET sql_mode=ORACLE; +SET default_storage_engine=ColumnStore; +# +# MDEV-13003 - Oracle compatibility : Replace function +# +SELECT REPLACE(null,'a','b') ; +REPLACE(null,'a','b') +NULL +SELECT REPLACE('ab',null,'b') ; +REPLACE('ab',null,'b') +ab +SELECT REPLACE('ab','a',null) ; +REPLACE('ab','a',null) +b +SELECT REPLACE('ab',null,null) ; +REPLACE('ab',null,null) +ab +SELECT REPLACE('aaa','a',null) ; +REPLACE('aaa','a',null) +NULL +EXPLAIN EXTENDED SELECT REPLACE('ab','a',null) ; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used +CREATE VIEW v1 AS SELECT REPLACE('ab','a',null) ; +SHOW CREATE VIEW v1; +View Create View character_set_client collation_connection +v1 CREATE VIEW "v1" AS select replace('ab','a',NULL) AS "REPLACE('ab','a',null)" latin1 latin1_swedish_ci +SELECT * FROM v1; +REPLACE('ab','a',null) +b +DROP VIEW v1; diff --git a/mysql-test/columnstore/oracle/func_replace_oracle_maxscale.test b/mysql-test/columnstore/oracle/func_replace_oracle_maxscale.test new file mode 100644 index 000000000..ac523805f --- /dev/null +++ b/mysql-test/columnstore/oracle/func_replace_oracle_maxscale.test @@ -0,0 +1,33 @@ +# +# Testing replace with null args +# + +--source ../include/have_columnstore.inc +--source ../include/detect_no_maxscale.inc + + +SET sql_mode=ORACLE; +SET default_storage_engine=ColumnStore; +--echo # +--echo # MDEV-13003 - Oracle compatibility : Replace function +--echo # + +--disable_query_log +--disable_warnings +DROP VIEW IF EXISTS v1; +--enable_query_log + + +SELECT REPLACE(null,'a','b') ; +SELECT REPLACE('ab',null,'b') ; +SELECT REPLACE('ab','a',null) ; +SELECT REPLACE('ab',null,null) ; +SELECT REPLACE('aaa','a',null) ; + +EXPLAIN EXTENDED SELECT REPLACE('ab','a',null) ; + +CREATE VIEW v1 AS SELECT REPLACE('ab','a',null) ; +SHOW CREATE VIEW v1; +SELECT * FROM v1; +DROP VIEW v1; +--enable_warnings diff --git a/mysql-test/columnstore/oracle/func_trim_oracle.test b/mysql-test/columnstore/oracle/func_trim_oracle.test index 0ce44a110..b30ecba80 100644 --- a/mysql-test/columnstore/oracle/func_trim_oracle.test +++ b/mysql-test/columnstore/oracle/func_trim_oracle.test @@ -1,3 +1,6 @@ +--source ../include/have_columnstore.inc +--source ../include/detect_maxscale.inc + SET sql_mode=ORACLE; SET default_storage_engine=ColumnStore;