You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-07-29 08:21:15 +03:00
Fix charset in MTR
This commit is contained in:
committed by
Leonid Fedorov
parent
68f60cd695
commit
38a5a7edec
@ -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;
|
||||
|
@ -497,3 +497,4 @@ DROP TABLE cs2;
|
||||
DROP TABLE cs3;
|
||||
DROP TABLE cs4;
|
||||
DROP TABLE cs5;
|
||||
DROP DATABASE IF EXISTS test_mcol641_aggregate;
|
||||
|
@ -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
|
||||
|
@ -1,5 +1,6 @@
|
||||
--source ../include/have_columnstore.inc
|
||||
--source ../include/functions.inc
|
||||
--source ../include/syscatalog_mysql.sql
|
||||
|
||||
SET default_storage_engine=columnstore;
|
||||
|
||||
|
@ -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='';
|
||||
|
||||
|
@ -0,0 +1 @@
|
||||
--skip-partition=0
|
@ -1,4 +1,6 @@
|
||||
--source ../include/have_columnstore.inc
|
||||
--source ../include/charset.inc
|
||||
|
||||
--disable_warnings
|
||||
DROP DATABASE IF EXISTS json_quote_db;
|
||||
|
||||
|
@ -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.
|
||||
|
@ -221,3 +221,4 @@ DROP TABLE cs2;
|
||||
DROP TABLE cs3;
|
||||
DROP TABLE cs4;
|
||||
DROP TABLE cs5;
|
||||
DROP DATABASE test_mcol641_aggregate;
|
||||
|
1
mysql-test/columnstore/basic/t/mcol641-insert.opt
Normal file
1
mysql-test/columnstore/basic/t/mcol641-insert.opt
Normal file
@ -0,0 +1 @@
|
||||
--secure-file-priv=''
|
@ -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;
|
||||
|
@ -4,6 +4,7 @@
|
||||
#
|
||||
-- source ../include/have_columnstore.inc
|
||||
-- source ../include/detect_maxscale.inc
|
||||
--source ../include/charset.inc
|
||||
|
||||
set names utf8;
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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.
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
Reference in New Issue
Block a user