From 38a5a7edec03f6a0fe25b9b317221b73fdbd27ab Mon Sep 17 00:00:00 2001 From: Timofey Turenko Date: Wed, 18 Jun 2025 18:01:51 +0300 Subject: [PATCH] Fix charset in MTR --- .../basic/r/MCOL-5744-utf8-in-ddl.result | 1 + .../basic/r/mcol641-aggregate.result | 1 + .../basic/r/mcs19_grant_revoke.result | 2 +- .../t/MCOL-5572-autoincrement-filtering.test | 1 + .../basic/t/MCOL-5744-utf8-in-ddl.test | 2 + ...artitioned-tables-in-crossengine-steps.opt | 1 + .../columnstore/basic/t/func_json_quote.test | 2 + mysql-test/columnstore/basic/t/mcol-5005.test | 1 + .../basic/t/mcol641-aggregate.test | 1 + .../columnstore/basic/t/mcol641-insert.opt | 1 + mysql-test/columnstore/basic/t/mcol_2000.test | 1 + .../basic/t/mcs117_create_utf8.test | 1 + .../basic/t/mcs12_alter_table.test | 2 +- .../basic/t/mcs13_alter_table_negative.test | 2 +- .../basic/t/mcs169_bin_functions.test | 1 + .../basic/t/mcs171_null_functions.test | 1 + .../basic/t/mcs173_coalesce_function.test | 1 + .../basic/t/mcs174_case_function.test | 1 + .../basic/t/mcs175_convert_functions.test | 1 + .../basic/t/mcs176_if_function.test | 1 + .../basic/t/mcs178_adddate_function.test | 1 + .../basic/t/mcs179_addtime_function.test | 1 + .../basic/t/mcs180_ascii_function.test | 1 + .../basic/t/mcs181_between_and.test | 1 + .../basic/t/mcs182_char_length_function.test | 1 + .../basic/t/mcs183_date_function.test | 1 + .../basic/t/mcs184_day_function.test | 1 + .../basic/t/mcs185_dayname_function.test | 1 + .../basic/t/mcs186_dayofyear_function.test | 1 + .../basic/t/mcs187_dayofmonth_function.test | 1 + .../basic/t/mcs19_grant_revoke.test | 4 +- .../basic/t/mcs1_create_table_data_types.test | 1 + .../basic/t/mcs229_data_compression_type.test | 1 + .../basic/t/mcs28_load_data_local_infile.test | 1 + .../mcs5_create_table_from_other_tables.test | 1 + .../basic/t/mcs74_check_constraint.test | 1 + .../t/mcs7_create_table_with_metadata.test | 1 + .../t/mcs8_create_table_with_constraints.test | 1 + mysql-test/columnstore/include/charset.inc | 5 ++ .../columnstore/include/syscatalog_mysql.sql | 46 +++++++++++++++++++ 40 files changed, 92 insertions(+), 5 deletions(-) create mode 100644 mysql-test/columnstore/basic/t/MCOL-5886-use-of-partitioned-tables-in-crossengine-steps.opt create mode 100644 mysql-test/columnstore/basic/t/mcol641-insert.opt create mode 100644 mysql-test/columnstore/include/charset.inc create mode 100644 mysql-test/columnstore/include/syscatalog_mysql.sql diff --git a/mysql-test/columnstore/basic/r/MCOL-5744-utf8-in-ddl.result b/mysql-test/columnstore/basic/r/MCOL-5744-utf8-in-ddl.result index dfd4742cd..97a184f2e 100644 --- a/mysql-test/columnstore/basic/r/MCOL-5744-utf8-in-ddl.result +++ b/mysql-test/columnstore/basic/r/MCOL-5744-utf8-in-ddl.result @@ -1,5 +1,6 @@ DROP DATABASE IF EXISTS MCOL5744; CREATE DATABASE MCOL5744; +USE MCOL5744; SET old_mode=''; CREATE TABLE t(x text CHARACTER SET utf8 COLLATE utf8_general_ci) ENGINE=COLUMNSTORE; SHOW CREATE TABLE t; diff --git a/mysql-test/columnstore/basic/r/mcol641-aggregate.result b/mysql-test/columnstore/basic/r/mcol641-aggregate.result index 97f74000b..b16f2123d 100644 --- a/mysql-test/columnstore/basic/r/mcol641-aggregate.result +++ b/mysql-test/columnstore/basic/r/mcol641-aggregate.result @@ -497,3 +497,4 @@ DROP TABLE cs2; DROP TABLE cs3; DROP TABLE cs4; DROP TABLE cs5; +DROP DATABASE IF EXISTS test_mcol641_aggregate; diff --git a/mysql-test/columnstore/basic/r/mcs19_grant_revoke.result b/mysql-test/columnstore/basic/r/mcs19_grant_revoke.result index 6ab1854c4..9a7880b83 100644 --- a/mysql-test/columnstore/basic/r/mcs19_grant_revoke.result +++ b/mysql-test/columnstore/basic/r/mcs19_grant_revoke.result @@ -41,7 +41,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `col` int(11) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci +) ENGINE=InnoDB INSERT INTO t1 VALUES(1); SELECT * FROM t1; col diff --git a/mysql-test/columnstore/basic/t/MCOL-5572-autoincrement-filtering.test b/mysql-test/columnstore/basic/t/MCOL-5572-autoincrement-filtering.test index de9d88014..8d331cf40 100644 --- a/mysql-test/columnstore/basic/t/MCOL-5572-autoincrement-filtering.test +++ b/mysql-test/columnstore/basic/t/MCOL-5572-autoincrement-filtering.test @@ -1,5 +1,6 @@ --source ../include/have_columnstore.inc --source ../include/functions.inc +--source ../include/syscatalog_mysql.sql SET default_storage_engine=columnstore; 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 60713bdc3..d7f83fe25 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 @@ -4,8 +4,10 @@ --disable_warnings DROP DATABASE IF EXISTS MCOL5744; --enable_warnings +--source ../include/charset.inc CREATE DATABASE MCOL5744; +USE MCOL5744; SET old_mode=''; diff --git a/mysql-test/columnstore/basic/t/MCOL-5886-use-of-partitioned-tables-in-crossengine-steps.opt b/mysql-test/columnstore/basic/t/MCOL-5886-use-of-partitioned-tables-in-crossengine-steps.opt new file mode 100644 index 000000000..d9562aa81 --- /dev/null +++ b/mysql-test/columnstore/basic/t/MCOL-5886-use-of-partitioned-tables-in-crossengine-steps.opt @@ -0,0 +1 @@ +--skip-partition=0 diff --git a/mysql-test/columnstore/basic/t/func_json_quote.test b/mysql-test/columnstore/basic/t/func_json_quote.test index cf08dae8e..8f87df9f4 100644 --- a/mysql-test/columnstore/basic/t/func_json_quote.test +++ b/mysql-test/columnstore/basic/t/func_json_quote.test @@ -1,4 +1,6 @@ --source ../include/have_columnstore.inc +--source ../include/charset.inc + --disable_warnings DROP DATABASE IF EXISTS json_quote_db; diff --git a/mysql-test/columnstore/basic/t/mcol-5005.test b/mysql-test/columnstore/basic/t/mcol-5005.test index 988a4ab16..fde196e9f 100644 --- a/mysql-test/columnstore/basic/t/mcol-5005.test +++ b/mysql-test/columnstore/basic/t/mcol-5005.test @@ -4,6 +4,7 @@ # --source ../include/have_columnstore.inc --source include/have_innodb.inc +--source ../include/charset.inc # # If the calpontsys database does not exist, let's create it. diff --git a/mysql-test/columnstore/basic/t/mcol641-aggregate.test b/mysql-test/columnstore/basic/t/mcol641-aggregate.test index fb0203088..642287152 100644 --- a/mysql-test/columnstore/basic/t/mcol641-aggregate.test +++ b/mysql-test/columnstore/basic/t/mcol641-aggregate.test @@ -221,3 +221,4 @@ DROP TABLE cs2; DROP TABLE cs3; DROP TABLE cs4; DROP TABLE cs5; +DROP DATABASE test_mcol641_aggregate; diff --git a/mysql-test/columnstore/basic/t/mcol641-insert.opt b/mysql-test/columnstore/basic/t/mcol641-insert.opt new file mode 100644 index 000000000..0b781d76f --- /dev/null +++ b/mysql-test/columnstore/basic/t/mcol641-insert.opt @@ -0,0 +1 @@ +--secure-file-priv='' diff --git a/mysql-test/columnstore/basic/t/mcol_2000.test b/mysql-test/columnstore/basic/t/mcol_2000.test index 42e9c5e0e..5dc47ad55 100644 --- a/mysql-test/columnstore/basic/t/mcol_2000.test +++ b/mysql-test/columnstore/basic/t/mcol_2000.test @@ -4,6 +4,7 @@ -- source ../include/have_columnstore.inc -- source include/have_innodb.inc +--source ../include/charset.inc -- disable_warnings drop database if exists test_mcol2000; diff --git a/mysql-test/columnstore/basic/t/mcs117_create_utf8.test b/mysql-test/columnstore/basic/t/mcs117_create_utf8.test index 0c11cab5b..3f7894408 100644 --- a/mysql-test/columnstore/basic/t/mcs117_create_utf8.test +++ b/mysql-test/columnstore/basic/t/mcs117_create_utf8.test @@ -4,6 +4,7 @@ # -- source ../include/have_columnstore.inc -- source ../include/detect_maxscale.inc +--source ../include/charset.inc set names utf8; diff --git a/mysql-test/columnstore/basic/t/mcs12_alter_table.test b/mysql-test/columnstore/basic/t/mcs12_alter_table.test index 69fa2c1ff..175086f43 100644 --- a/mysql-test/columnstore/basic/t/mcs12_alter_table.test +++ b/mysql-test/columnstore/basic/t/mcs12_alter_table.test @@ -4,7 +4,7 @@ -- source ../include/have_columnstore.inc -- source include/have_innodb.inc -- source ../include/check_maxscale.inc - +--source ../include/charset.inc --disable_warnings DROP DATABASE IF EXISTS mcs12_db1; diff --git a/mysql-test/columnstore/basic/t/mcs13_alter_table_negative.test b/mysql-test/columnstore/basic/t/mcs13_alter_table_negative.test index 0c4b86415..ade63563a 100644 --- a/mysql-test/columnstore/basic/t/mcs13_alter_table_negative.test +++ b/mysql-test/columnstore/basic/t/mcs13_alter_table_negative.test @@ -3,7 +3,7 @@ # -- source ../include/have_columnstore.inc -- source ../include/check_maxscale.inc - +--source ../include/charset.inc --disable_warnings DROP DATABASE IF EXISTS mcs13_db1; diff --git a/mysql-test/columnstore/basic/t/mcs169_bin_functions.test b/mysql-test/columnstore/basic/t/mcs169_bin_functions.test index e8722e85f..7c10c3ace 100644 --- a/mysql-test/columnstore/basic/t/mcs169_bin_functions.test +++ b/mysql-test/columnstore/basic/t/mcs169_bin_functions.test @@ -3,6 +3,7 @@ # Author: Bharath, bharath.bokka@mariadb.com # -- source ../include/have_columnstore.inc +--source ../include/charset.inc --disable_warnings DROP DATABASE IF EXISTS mcs169_db; diff --git a/mysql-test/columnstore/basic/t/mcs171_null_functions.test b/mysql-test/columnstore/basic/t/mcs171_null_functions.test index 6f814dd36..997678a13 100644 --- a/mysql-test/columnstore/basic/t/mcs171_null_functions.test +++ b/mysql-test/columnstore/basic/t/mcs171_null_functions.test @@ -3,6 +3,7 @@ # Author: Bharath, bharath.bokka@mariadb.com # -- source ../include/have_columnstore.inc +--source ../include/charset.inc --disable_warnings DROP DATABASE IF EXISTS mcs171_db; diff --git a/mysql-test/columnstore/basic/t/mcs173_coalesce_function.test b/mysql-test/columnstore/basic/t/mcs173_coalesce_function.test index 8a8df2c0e..424d447ea 100644 --- a/mysql-test/columnstore/basic/t/mcs173_coalesce_function.test +++ b/mysql-test/columnstore/basic/t/mcs173_coalesce_function.test @@ -3,6 +3,7 @@ # Author: Bharath, bharath.bokka@mariadb.com # -- source ../include/have_columnstore.inc +--source ../include/charset.inc --disable_warnings DROP DATABASE IF EXISTS mcs173_db; diff --git a/mysql-test/columnstore/basic/t/mcs174_case_function.test b/mysql-test/columnstore/basic/t/mcs174_case_function.test index 72afc4e7c..774461e89 100644 --- a/mysql-test/columnstore/basic/t/mcs174_case_function.test +++ b/mysql-test/columnstore/basic/t/mcs174_case_function.test @@ -3,6 +3,7 @@ # Author: Bharath, bharath.bokka@mariadb.com # -- source ../include/have_columnstore.inc +--source ../include/charset.inc --disable_warnings DROP DATABASE IF EXISTS mcs174_db; diff --git a/mysql-test/columnstore/basic/t/mcs175_convert_functions.test b/mysql-test/columnstore/basic/t/mcs175_convert_functions.test index f6e7c34c5..8d2830532 100644 --- a/mysql-test/columnstore/basic/t/mcs175_convert_functions.test +++ b/mysql-test/columnstore/basic/t/mcs175_convert_functions.test @@ -3,6 +3,7 @@ # Author: Bharath, bharath.bokka@mariadb.com # -- source ../include/have_columnstore.inc +--source ../include/charset.inc --disable_warnings DROP DATABASE IF EXISTS mcs175_db; diff --git a/mysql-test/columnstore/basic/t/mcs176_if_function.test b/mysql-test/columnstore/basic/t/mcs176_if_function.test index 6add1bffe..1889804dc 100644 --- a/mysql-test/columnstore/basic/t/mcs176_if_function.test +++ b/mysql-test/columnstore/basic/t/mcs176_if_function.test @@ -3,6 +3,7 @@ # Author: Bharath, bharath.bokka@mariadb.com # -- source ../include/have_columnstore.inc +--source ../include/charset.inc --disable_warnings DROP DATABASE IF EXISTS mcs176_db; diff --git a/mysql-test/columnstore/basic/t/mcs178_adddate_function.test b/mysql-test/columnstore/basic/t/mcs178_adddate_function.test index 71d278b50..d788f9bbb 100644 --- a/mysql-test/columnstore/basic/t/mcs178_adddate_function.test +++ b/mysql-test/columnstore/basic/t/mcs178_adddate_function.test @@ -3,6 +3,7 @@ # Author: Bharath, bharath.bokka@mariadb.com # -- source ../include/have_columnstore.inc +--source ../include/charset.inc --disable_warnings DROP DATABASE IF EXISTS mcs178_db; diff --git a/mysql-test/columnstore/basic/t/mcs179_addtime_function.test b/mysql-test/columnstore/basic/t/mcs179_addtime_function.test index 9fa1372b7..4081c3d98 100644 --- a/mysql-test/columnstore/basic/t/mcs179_addtime_function.test +++ b/mysql-test/columnstore/basic/t/mcs179_addtime_function.test @@ -3,6 +3,7 @@ # Author: Bharath, bharath.bokka@mariadb.com # -- source ../include/have_columnstore.inc +--source ../include/charset.inc --disable_warnings DROP DATABASE IF EXISTS mcs179_db; diff --git a/mysql-test/columnstore/basic/t/mcs180_ascii_function.test b/mysql-test/columnstore/basic/t/mcs180_ascii_function.test index b39ad622c..2904cd22e 100644 --- a/mysql-test/columnstore/basic/t/mcs180_ascii_function.test +++ b/mysql-test/columnstore/basic/t/mcs180_ascii_function.test @@ -3,6 +3,7 @@ # Author: Bharath, bharath.bokka@mariadb.com # -- source ../include/have_columnstore.inc +--source ../include/charset.inc --disable_warnings DROP DATABASE IF EXISTS mcs180_db; diff --git a/mysql-test/columnstore/basic/t/mcs181_between_and.test b/mysql-test/columnstore/basic/t/mcs181_between_and.test index a11282789..6a949a261 100644 --- a/mysql-test/columnstore/basic/t/mcs181_between_and.test +++ b/mysql-test/columnstore/basic/t/mcs181_between_and.test @@ -3,6 +3,7 @@ # Author: Bharath, bharath.bokka@mariadb.com # -- source ../include/have_columnstore.inc +--source ../include/charset.inc --disable_warnings DROP DATABASE IF EXISTS mcs181_db; diff --git a/mysql-test/columnstore/basic/t/mcs182_char_length_function.test b/mysql-test/columnstore/basic/t/mcs182_char_length_function.test index b46523fe8..a1de4382e 100644 --- a/mysql-test/columnstore/basic/t/mcs182_char_length_function.test +++ b/mysql-test/columnstore/basic/t/mcs182_char_length_function.test @@ -3,6 +3,7 @@ # Author: Bharath, bharath.bokka@mariadb.com # -- source ../include/have_columnstore.inc +--source ../include/charset.inc --disable_warnings DROP DATABASE IF EXISTS mcs182_db; diff --git a/mysql-test/columnstore/basic/t/mcs183_date_function.test b/mysql-test/columnstore/basic/t/mcs183_date_function.test index 322ffdc29..1a937f4c2 100644 --- a/mysql-test/columnstore/basic/t/mcs183_date_function.test +++ b/mysql-test/columnstore/basic/t/mcs183_date_function.test @@ -3,6 +3,7 @@ # Author: Bharath, bharath.bokka@mariadb.com # -- source ../include/have_columnstore.inc +--source ../include/charset.inc --disable_warnings DROP DATABASE IF EXISTS mcs183_db; diff --git a/mysql-test/columnstore/basic/t/mcs184_day_function.test b/mysql-test/columnstore/basic/t/mcs184_day_function.test index 74fcd3837..d23b3d4ea 100644 --- a/mysql-test/columnstore/basic/t/mcs184_day_function.test +++ b/mysql-test/columnstore/basic/t/mcs184_day_function.test @@ -3,6 +3,7 @@ # Author: Bharath, bharath.bokka@mariadb.com # -- source ../include/have_columnstore.inc +--source ../include/charset.inc --disable_warnings DROP DATABASE IF EXISTS mcs184_db; diff --git a/mysql-test/columnstore/basic/t/mcs185_dayname_function.test b/mysql-test/columnstore/basic/t/mcs185_dayname_function.test index 65f8bcbbb..4c0a61314 100644 --- a/mysql-test/columnstore/basic/t/mcs185_dayname_function.test +++ b/mysql-test/columnstore/basic/t/mcs185_dayname_function.test @@ -3,6 +3,7 @@ # Author: Bharath, bharath.bokka@mariadb.com # -- source ../include/have_columnstore.inc +--source ../include/charset.inc --disable_warnings DROP DATABASE IF EXISTS mcs185_db; diff --git a/mysql-test/columnstore/basic/t/mcs186_dayofyear_function.test b/mysql-test/columnstore/basic/t/mcs186_dayofyear_function.test index 9e0b2c274..afa475c38 100644 --- a/mysql-test/columnstore/basic/t/mcs186_dayofyear_function.test +++ b/mysql-test/columnstore/basic/t/mcs186_dayofyear_function.test @@ -3,6 +3,7 @@ # Author: Bharath, bharath.bokka@mariadb.com # -- source ../include/have_columnstore.inc +--source ../include/charset.inc --disable_warnings DROP DATABASE IF EXISTS mcs186_db; diff --git a/mysql-test/columnstore/basic/t/mcs187_dayofmonth_function.test b/mysql-test/columnstore/basic/t/mcs187_dayofmonth_function.test index bcd51b27a..4686b7480 100644 --- a/mysql-test/columnstore/basic/t/mcs187_dayofmonth_function.test +++ b/mysql-test/columnstore/basic/t/mcs187_dayofmonth_function.test @@ -3,6 +3,7 @@ # Author: Bharath, bharath.bokka@mariadb.com # -- source ../include/have_columnstore.inc +--source ../include/charset.inc --disable_warnings DROP DATABASE IF EXISTS mcs187_db; diff --git a/mysql-test/columnstore/basic/t/mcs19_grant_revoke.test b/mysql-test/columnstore/basic/t/mcs19_grant_revoke.test index f514756ef..4ae71180d 100644 --- a/mysql-test/columnstore/basic/t/mcs19_grant_revoke.test +++ b/mysql-test/columnstore/basic/t/mcs19_grant_revoke.test @@ -5,7 +5,7 @@ -- source ../include/have_columnstore.inc -- source include/have_innodb.inc -- source ../include/check_maxscale.inc - +--source ../include/charset.inc SET default_storage_engine=InnoDB; @@ -50,7 +50,7 @@ USE mcs19_db; --error ER_DBACCESS_DENIED_ERROR CREATE DATABASE mcs19_db1; CREATE TABLE t1(col INT) ENGINE=InnoDB; ---replace_regex /( COLLATE=latin1_swedish_ci)// +--replace_regex /(\ DEFAULT CHARSET(.*))// SHOW CREATE TABLE t1; INSERT INTO t1 VALUES(1); SELECT * FROM t1; diff --git a/mysql-test/columnstore/basic/t/mcs1_create_table_data_types.test b/mysql-test/columnstore/basic/t/mcs1_create_table_data_types.test index e0e630333..bacda2ef9 100644 --- a/mysql-test/columnstore/basic/t/mcs1_create_table_data_types.test +++ b/mysql-test/columnstore/basic/t/mcs1_create_table_data_types.test @@ -3,6 +3,7 @@ # Author: Bharath, bharath.bokka@mariadb.com # -- source ../include/have_columnstore.inc +--source ../include/charset.inc --disable_warnings DROP DATABASE IF EXISTS mcs1_db; diff --git a/mysql-test/columnstore/basic/t/mcs229_data_compression_type.test b/mysql-test/columnstore/basic/t/mcs229_data_compression_type.test index 3737eaa68..8e4e60ff3 100644 --- a/mysql-test/columnstore/basic/t/mcs229_data_compression_type.test +++ b/mysql-test/columnstore/basic/t/mcs229_data_compression_type.test @@ -3,6 +3,7 @@ # Author: Bharath, bharath.bokka@mariadb.com # -- source ../include/have_columnstore.inc +--source ../include/charset.inc # # If the calpontsys database does not exist, let's create it. diff --git a/mysql-test/columnstore/basic/t/mcs28_load_data_local_infile.test b/mysql-test/columnstore/basic/t/mcs28_load_data_local_infile.test index af2e11e78..6ab41785a 100755 --- a/mysql-test/columnstore/basic/t/mcs28_load_data_local_infile.test +++ b/mysql-test/columnstore/basic/t/mcs28_load_data_local_infile.test @@ -4,6 +4,7 @@ # -- source ../include/have_columnstore.inc --source ../include/detect_maxscale.inc +--source ../include/charset.inc --disable_warnings DROP DATABASE IF EXISTS mcs28_db1; diff --git a/mysql-test/columnstore/basic/t/mcs5_create_table_from_other_tables.test b/mysql-test/columnstore/basic/t/mcs5_create_table_from_other_tables.test index c08c3aed3..acf966a28 100644 --- a/mysql-test/columnstore/basic/t/mcs5_create_table_from_other_tables.test +++ b/mysql-test/columnstore/basic/t/mcs5_create_table_from_other_tables.test @@ -3,6 +3,7 @@ # -- source ../include/have_columnstore.inc -- source include/have_innodb.inc +--source ../include/charset.inc --disable_warnings DROP DATABASE IF EXISTS mcs5_db; diff --git a/mysql-test/columnstore/basic/t/mcs74_check_constraint.test b/mysql-test/columnstore/basic/t/mcs74_check_constraint.test index f1620cdc2..e25e9cf5c 100644 --- a/mysql-test/columnstore/basic/t/mcs74_check_constraint.test +++ b/mysql-test/columnstore/basic/t/mcs74_check_constraint.test @@ -3,6 +3,7 @@ # Author: Bharath, bharath.bokka@mariadb.com # -- source ../include/have_columnstore.inc +--source ../include/charset.inc --disable_warnings DROP DATABASE IF EXISTS mcs74_db; diff --git a/mysql-test/columnstore/basic/t/mcs7_create_table_with_metadata.test b/mysql-test/columnstore/basic/t/mcs7_create_table_with_metadata.test index dabd48eb0..3e511991a 100644 --- a/mysql-test/columnstore/basic/t/mcs7_create_table_with_metadata.test +++ b/mysql-test/columnstore/basic/t/mcs7_create_table_with_metadata.test @@ -2,6 +2,7 @@ #Test CREATE TABLE with metadata # -- source ../include/have_columnstore.inc +--source ../include/charset.inc --disable_warnings DROP DATABASE IF EXISTS mcs7_db; diff --git a/mysql-test/columnstore/basic/t/mcs8_create_table_with_constraints.test b/mysql-test/columnstore/basic/t/mcs8_create_table_with_constraints.test index d5ef1fcf1..4144423d0 100644 --- a/mysql-test/columnstore/basic/t/mcs8_create_table_with_constraints.test +++ b/mysql-test/columnstore/basic/t/mcs8_create_table_with_constraints.test @@ -2,6 +2,7 @@ #Test CREATE TABLE with all supported constraints in Columnstore # -- source ../include/have_columnstore.inc +--source ../include/charset.inc --disable_warnings DROP DATABASE IF EXISTS mcs8_db; diff --git a/mysql-test/columnstore/include/charset.inc b/mysql-test/columnstore/include/charset.inc new file mode 100644 index 000000000..15c273e8e --- /dev/null +++ b/mysql-test/columnstore/include/charset.inc @@ -0,0 +1,5 @@ +--disable_query_log +SET character_set_server = 'utf8mb3'; +SET collation_server = 'utf8mb3_general_ci'; +--enable_query_log + diff --git a/mysql-test/columnstore/include/syscatalog_mysql.sql b/mysql-test/columnstore/include/syscatalog_mysql.sql new file mode 100644 index 000000000..551efa69f --- /dev/null +++ b/mysql-test/columnstore/include/syscatalog_mysql.sql @@ -0,0 +1,46 @@ +--disable_query_log +create database if not exists calpontsys; + +use calpontsys; + +drop table if exists systable restrict; +drop table if exists syscolumn restrict; + +create table if not exists systable (tablename varchar(128), + `schema` varchar(128), + objectid int, + createdate date, + lastupdate date, + init int, + next int, + numofrows int, + avgrowlen int, + numofblocks int, + autoincrement int, + auxcolumnoid int not null default 0) engine=columnstore comment='SCHEMA SYNC ONLY'; + +create table if not exists syscolumn (`schema` varchar(128), + tablename varchar(128), + columnname varchar(128), + objectid integer, + dictobjectid integer, + listobjectid integer, + treeobjectid integer, + datatype integer, + columnlength integer, + columnposition integer, + lastupdate date, + defaultvalue varchar(64), + nullable integer, + scale integer, + prec integer, + autoincrement char(1), + distcount integer, + nullcount integer, + minvalue varchar(64), + `maxvalue` varchar(64), + compressiontype integer, + nextvalue bigint, + charsetnum int not null default 0) engine=columnstore comment='SCHEMA SYNC ONLY'; + +--enable_query_log