mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-06-09 06:41:19 +03:00
d50a0fa2e6
1. Extend the calpontsys.syscolumn system catalog table with a new column, 'charsetnum'. 'charsetnum' field is set to the 'number' member of the 'charset_info_st' struct defined in the server in m_ctype.h. For CHAR/VARCHAR/TEXT column types, 'charset_info_st' is initialized to the charset/collation of the column, which is set at the column-level or at the table-level in the DDL. For BLOB/VARBINARY binary column types, 'charset_info_st' is initialized to my_charset_bin (charsetnum=63). For all other column types, charsetnum is set to 0. 2. Add support for the newly added 'charsetnum' column in the automatic system catalog upgrade logic in dbbuilder. For existing table definitions, charsetnum for the column is defaulted to 0. 3. Add MTR test case that creates a few table definitions with a range of charset/collation combinations and queries the calpontsys.syscolumn system catalog table with the charsetnum field for the columns in the table DDLs.
68 lines
1.6 KiB
Plaintext
68 lines
1.6 KiB
Plaintext
#
|
|
# MCOL-5005 Add charset number to the calpontsys.syscolumn system
|
|
# catalog table
|
|
#
|
|
--source ../include/have_columnstore.inc
|
|
--source include/have_innodb.inc
|
|
|
|
#
|
|
# If the calpontsys database does not exist, let's create it.
|
|
# It's possible if we're running mtr without --extern.
|
|
#
|
|
let $calpontsys_exists=`SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='calpontsys' AND TABLE_NAME='syscolumn';`;
|
|
--disable_query_log
|
|
if (!$calpontsys_exists)
|
|
{
|
|
--exec $MYSQL < $MCS_SYSCATALOG_MYSQL_SQL
|
|
use test;
|
|
}
|
|
--enable_query_log
|
|
|
|
|
|
--disable_warnings
|
|
DROP DATABASE IF EXISTS mcol5005;
|
|
--enable_warnings
|
|
|
|
CREATE DATABASE mcol5005;
|
|
|
|
USE mcol5005;
|
|
|
|
CREATE TABLE t1 (
|
|
a VARCHAR(15) collate utf8mb4_romanian_ci,
|
|
b VARCHAR(15) charset 'utf8mb3',
|
|
c VARCHAR(15),
|
|
d BLOB(15),
|
|
e INT
|
|
) ENGINE=columnstore collate=latin2_croatian_ci;
|
|
|
|
ALTER TABLE t1 ADD COLUMN (f VARCHAR(15) collate 'utf8mb4_icelandic_ci');
|
|
ALTER TABLE t1 ADD COLUMN (g VARCHAR(15));
|
|
|
|
CREATE TABLE t2 ENGINE=columnstore AS SELECT * FROM t1;
|
|
|
|
CREATE TABLE t3 LIKE t1;
|
|
|
|
CREATE TABLE t4 (a varchar(15)) ENGINE=InnoDB charset=latin2;
|
|
SHOW CREATE TABLE t4;
|
|
ALTER TABLE t4 ENGINE=columnstore;
|
|
|
|
SHOW CREATE TABLE t1;
|
|
SHOW CREATE TABLE t2;
|
|
SHOW CREATE TABLE t3;
|
|
SHOW CREATE TABLE t4;
|
|
|
|
SELECT `schema`, tablename, columnname, charsetnum FROM calpontsys.syscolumn
|
|
WHERE `schema`='mcol5005' AND tablename in ('t1', 't2', 't3', 't4');
|
|
|
|
DROP DATABASE mcol5005;
|
|
|
|
|
|
--disable_query_log
|
|
if (!$calpontsys_exists)
|
|
{
|
|
drop table calpontsys.systable restrict;
|
|
drop table calpontsys.syscolumn restrict;
|
|
drop database calpontsys;
|
|
}
|
|
--enable_query_log
|