database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

Fix charset in MTR

Browse Source
This commit is contained in:
Timofey Turenko
2025-06-18 18:01:51 +03:00
committed by Leonid Fedorov
parent 68f60cd695
commit 38a5a7edec
40 changed files with 92 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/columnstore/basic/r/MCOL-5744-utf8-in-ddl.result
View File

@ -1,5 +1,6 @@
DROP DATABASE IF EXISTS MCOL5744; DROP DATABASE IF EXISTS MCOL5744;
CREATE DATABASE MCOL5744; CREATE DATABASE MCOL5744;
USE MCOL5744;
SET old_mode=''; SET old_mode='';
CREATE TABLE t(x text CHARACTER SET utf8 COLLATE utf8_general_ci) ENGINE=COLUMNSTORE; CREATE TABLE t(x text CHARACTER SET utf8 COLLATE utf8_general_ci) ENGINE=COLUMNSTORE;
SHOW CREATE TABLE t; SHOW CREATE TABLE t;

1
mysql-test/columnstore/basic/r/mcol641-aggregate.result
View File

@ -497,3 +497,4 @@ DROP TABLE cs2;
DROP TABLE cs3; DROP TABLE cs3;
DROP TABLE cs4; DROP TABLE cs4;
DROP TABLE cs5; DROP TABLE cs5;
DROP DATABASE IF EXISTS test_mcol641_aggregate;

2
mysql-test/columnstore/basic/r/mcs19_grant_revoke.result
View File

@ -41,7 +41,7 @@ SHOW CREATE TABLE t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`col` int(11) DEFAULT NULL `col` int(11) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci ) ENGINE=InnoDB
INSERT INTO t1 VALUES(1); INSERT INTO t1 VALUES(1);
SELECT * FROM t1; SELECT * FROM t1;
col col

1
mysql-test/columnstore/basic/t/MCOL-5572-autoincrement-filtering.test
View File

@ -1,5 +1,6 @@
--source ../include/have_columnstore.inc --source ../include/have_columnstore.inc
--source ../include/functions.inc --source ../include/functions.inc
--source ../include/syscatalog_mysql.sql
SET default_storage_engine=columnstore; SET default_storage_engine=columnstore;

2
mysql-test/columnstore/basic/t/MCOL-5744-utf8-in-ddl.test
View File

@ -4,8 +4,10 @@
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS MCOL5744; DROP DATABASE IF EXISTS MCOL5744;
--enable_warnings --enable_warnings
--source ../include/charset.inc
CREATE DATABASE MCOL5744; CREATE DATABASE MCOL5744;
USE MCOL5744;
SET old_mode=''; SET old_mode='';

1
mysql-test/columnstore/basic/t/MCOL-5886-use-of-partitioned-tables-in-crossengine-steps.opt Normal file
View File

@ -0,0 +1 @@
--skip-partition=0

2
mysql-test/columnstore/basic/t/func_json_quote.test
View File

@ -1,4 +1,6 @@
--source ../include/have_columnstore.inc --source ../include/have_columnstore.inc
--source ../include/charset.inc
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS json_quote_db; DROP DATABASE IF EXISTS json_quote_db;

1
mysql-test/columnstore/basic/t/mcol-5005.test
View File

@ -4,6 +4,7 @@
# #
--source ../include/have_columnstore.inc --source ../include/have_columnstore.inc
--source include/have_innodb.inc --source include/have_innodb.inc
--source ../include/charset.inc
# #
# If the calpontsys database does not exist, let's create it. # If the calpontsys database does not exist, let's create it.

1
mysql-test/columnstore/basic/t/mcol641-aggregate.test
View File

@ -221,3 +221,4 @@ DROP TABLE cs2;
DROP TABLE cs3; DROP TABLE cs3;
DROP TABLE cs4; DROP TABLE cs4;
DROP TABLE cs5; DROP TABLE cs5;
DROP DATABASE test_mcol641_aggregate;

1
mysql-test/columnstore/basic/t/mcol641-insert.opt Normal file
View File

@ -0,0 +1 @@
--secure-file-priv=''

1
mysql-test/columnstore/basic/t/mcol_2000.test
View File

@ -4,6 +4,7 @@
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
-- source include/have_innodb.inc -- source include/have_innodb.inc
--source ../include/charset.inc
-- disable_warnings -- disable_warnings
drop database if exists test_mcol2000; drop database if exists test_mcol2000;

1
mysql-test/columnstore/basic/t/mcs117_create_utf8.test
View File

@ -4,6 +4,7 @@
# #
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
-- source ../include/detect_maxscale.inc -- source ../include/detect_maxscale.inc
--source ../include/charset.inc
set names utf8; set names utf8;

2
mysql-test/columnstore/basic/t/mcs12_alter_table.test
View File

@ -4,7 +4,7 @@
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
-- source include/have_innodb.inc -- source include/have_innodb.inc
-- source ../include/check_maxscale.inc -- source ../include/check_maxscale.inc
--source ../include/charset.inc
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs12_db1; DROP DATABASE IF EXISTS mcs12_db1;

2
mysql-test/columnstore/basic/t/mcs13_alter_table_negative.test
View File

@ -3,7 +3,7 @@
# #
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
-- source ../include/check_maxscale.inc -- source ../include/check_maxscale.inc
--source ../include/charset.inc
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs13_db1; DROP DATABASE IF EXISTS mcs13_db1;

1
mysql-test/columnstore/basic/t/mcs169_bin_functions.test
View File

@ -3,6 +3,7 @@
# Author: Bharath, bharath.bokka@mariadb.com # Author: Bharath, bharath.bokka@mariadb.com
# #
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
--source ../include/charset.inc
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs169_db; DROP DATABASE IF EXISTS mcs169_db;

1
mysql-test/columnstore/basic/t/mcs171_null_functions.test
View File

@ -3,6 +3,7 @@
# Author: Bharath, bharath.bokka@mariadb.com # Author: Bharath, bharath.bokka@mariadb.com
# #
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
--source ../include/charset.inc
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs171_db; DROP DATABASE IF EXISTS mcs171_db;

1
mysql-test/columnstore/basic/t/mcs173_coalesce_function.test
View File

@ -3,6 +3,7 @@
# Author: Bharath, bharath.bokka@mariadb.com # Author: Bharath, bharath.bokka@mariadb.com
# #
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
--source ../include/charset.inc
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs173_db; DROP DATABASE IF EXISTS mcs173_db;

1
mysql-test/columnstore/basic/t/mcs174_case_function.test
View File

@ -3,6 +3,7 @@
# Author: Bharath, bharath.bokka@mariadb.com # Author: Bharath, bharath.bokka@mariadb.com
# #
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
--source ../include/charset.inc
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs174_db; DROP DATABASE IF EXISTS mcs174_db;

1
mysql-test/columnstore/basic/t/mcs175_convert_functions.test
View File

@ -3,6 +3,7 @@
# Author: Bharath, bharath.bokka@mariadb.com # Author: Bharath, bharath.bokka@mariadb.com
# #
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
--source ../include/charset.inc
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs175_db; DROP DATABASE IF EXISTS mcs175_db;

1
mysql-test/columnstore/basic/t/mcs176_if_function.test
View File

@ -3,6 +3,7 @@
# Author: Bharath, bharath.bokka@mariadb.com # Author: Bharath, bharath.bokka@mariadb.com
# #
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
--source ../include/charset.inc
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs176_db; DROP DATABASE IF EXISTS mcs176_db;

1
mysql-test/columnstore/basic/t/mcs178_adddate_function.test
View File

@ -3,6 +3,7 @@
# Author: Bharath, bharath.bokka@mariadb.com # Author: Bharath, bharath.bokka@mariadb.com
# #
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
--source ../include/charset.inc
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs178_db; DROP DATABASE IF EXISTS mcs178_db;

1
mysql-test/columnstore/basic/t/mcs179_addtime_function.test
View File

@ -3,6 +3,7 @@
# Author: Bharath, bharath.bokka@mariadb.com # Author: Bharath, bharath.bokka@mariadb.com
# #
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
--source ../include/charset.inc
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs179_db; DROP DATABASE IF EXISTS mcs179_db;

1
mysql-test/columnstore/basic/t/mcs180_ascii_function.test
View File

@ -3,6 +3,7 @@
# Author: Bharath, bharath.bokka@mariadb.com # Author: Bharath, bharath.bokka@mariadb.com
# #
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
--source ../include/charset.inc
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs180_db; DROP DATABASE IF EXISTS mcs180_db;

1
mysql-test/columnstore/basic/t/mcs181_between_and.test
View File

@ -3,6 +3,7 @@
# Author: Bharath, bharath.bokka@mariadb.com # Author: Bharath, bharath.bokka@mariadb.com
# #
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
--source ../include/charset.inc
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs181_db; DROP DATABASE IF EXISTS mcs181_db;

1
mysql-test/columnstore/basic/t/mcs182_char_length_function.test
View File

@ -3,6 +3,7 @@
# Author: Bharath, bharath.bokka@mariadb.com # Author: Bharath, bharath.bokka@mariadb.com
# #
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
--source ../include/charset.inc
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs182_db; DROP DATABASE IF EXISTS mcs182_db;

1
mysql-test/columnstore/basic/t/mcs183_date_function.test
View File

@ -3,6 +3,7 @@
# Author: Bharath, bharath.bokka@mariadb.com # Author: Bharath, bharath.bokka@mariadb.com
# #
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
--source ../include/charset.inc
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs183_db; DROP DATABASE IF EXISTS mcs183_db;

1
mysql-test/columnstore/basic/t/mcs184_day_function.test
View File

@ -3,6 +3,7 @@
# Author: Bharath, bharath.bokka@mariadb.com # Author: Bharath, bharath.bokka@mariadb.com
# #
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
--source ../include/charset.inc
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs184_db; DROP DATABASE IF EXISTS mcs184_db;

1
mysql-test/columnstore/basic/t/mcs185_dayname_function.test
View File

@ -3,6 +3,7 @@
# Author: Bharath, bharath.bokka@mariadb.com # Author: Bharath, bharath.bokka@mariadb.com
# #
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
--source ../include/charset.inc
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs185_db; DROP DATABASE IF EXISTS mcs185_db;

1
mysql-test/columnstore/basic/t/mcs186_dayofyear_function.test
View File

@ -3,6 +3,7 @@
# Author: Bharath, bharath.bokka@mariadb.com # Author: Bharath, bharath.bokka@mariadb.com
# #
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
--source ../include/charset.inc
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs186_db; DROP DATABASE IF EXISTS mcs186_db;

1
mysql-test/columnstore/basic/t/mcs187_dayofmonth_function.test
View File

@ -3,6 +3,7 @@
# Author: Bharath, bharath.bokka@mariadb.com # Author: Bharath, bharath.bokka@mariadb.com
# #
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
--source ../include/charset.inc
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs187_db; DROP DATABASE IF EXISTS mcs187_db;

4
mysql-test/columnstore/basic/t/mcs19_grant_revoke.test
View File

@ -5,7 +5,7 @@
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
-- source include/have_innodb.inc -- source include/have_innodb.inc
-- source ../include/check_maxscale.inc -- source ../include/check_maxscale.inc
--source ../include/charset.inc
SET default_storage_engine=InnoDB; SET default_storage_engine=InnoDB;
@ -50,7 +50,7 @@ USE mcs19_db;
--error ER_DBACCESS_DENIED_ERROR --error ER_DBACCESS_DENIED_ERROR
CREATE DATABASE mcs19_db1; CREATE DATABASE mcs19_db1;
CREATE TABLE t1(col INT) ENGINE=InnoDB; CREATE TABLE t1(col INT) ENGINE=InnoDB;
--replace_regex /( COLLATE=latin1_swedish_ci)// --replace_regex /(\ DEFAULT CHARSET(.*))//
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
INSERT INTO t1 VALUES(1); INSERT INTO t1 VALUES(1);
SELECT * FROM t1; SELECT * FROM t1;

1
mysql-test/columnstore/basic/t/mcs1_create_table_data_types.test
View File

@ -3,6 +3,7 @@
# Author: Bharath, bharath.bokka@mariadb.com # Author: Bharath, bharath.bokka@mariadb.com
# #
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
--source ../include/charset.inc
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs1_db; DROP DATABASE IF EXISTS mcs1_db;

1
mysql-test/columnstore/basic/t/mcs229_data_compression_type.test
View File

@ -3,6 +3,7 @@
# Author: Bharath, bharath.bokka@mariadb.com # Author: Bharath, bharath.bokka@mariadb.com
# #
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
--source ../include/charset.inc
# #
# If the calpontsys database does not exist, let's create it. # If the calpontsys database does not exist, let's create it.

1
mysql-test/columnstore/basic/t/mcs28_load_data_local_infile.test
View File

@ -4,6 +4,7 @@
# #
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
--source ../include/detect_maxscale.inc --source ../include/detect_maxscale.inc
--source ../include/charset.inc
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs28_db1; DROP DATABASE IF EXISTS mcs28_db1;

1
mysql-test/columnstore/basic/t/mcs5_create_table_from_other_tables.test
View File

@ -3,6 +3,7 @@
# #
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
-- source include/have_innodb.inc -- source include/have_innodb.inc
--source ../include/charset.inc
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs5_db; DROP DATABASE IF EXISTS mcs5_db;

1
mysql-test/columnstore/basic/t/mcs74_check_constraint.test
View File

@ -3,6 +3,7 @@
# Author: Bharath, bharath.bokka@mariadb.com # Author: Bharath, bharath.bokka@mariadb.com
# #
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
--source ../include/charset.inc
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs74_db; DROP DATABASE IF EXISTS mcs74_db;

1
mysql-test/columnstore/basic/t/mcs7_create_table_with_metadata.test
View File

@ -2,6 +2,7 @@
#Test CREATE TABLE with metadata #Test CREATE TABLE with metadata
# #
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
--source ../include/charset.inc
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs7_db; DROP DATABASE IF EXISTS mcs7_db;

1
mysql-test/columnstore/basic/t/mcs8_create_table_with_constraints.test
View File

@ -2,6 +2,7 @@
#Test CREATE TABLE with all supported constraints in Columnstore #Test CREATE TABLE with all supported constraints in Columnstore
# #
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
--source ../include/charset.inc
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs8_db; DROP DATABASE IF EXISTS mcs8_db;

5
mysql-test/columnstore/include/charset.inc Normal file
View File

@ -0,0 +1,5 @@
--disable_query_log
SET character_set_server = 'utf8mb3';
SET collation_server = 'utf8mb3_general_ci';
--enable_query_log

46
mysql-test/columnstore/include/syscatalog_mysql.sql Normal file
View File

@ -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