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

fix(tests): fix mcol_2000

Browse Source
This commit is contained in:
aleksei.bukhalov
2025-08-04 20:37:54 +02:00
parent 91d308d8d1
commit 92dacbf024
2 changed files with 30 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
mysql-test/columnstore/basic/r/mcol_2000.result
View File

@@ -20,17 +20,17 @@ l date,
m datetime, m datetime,
o time, o time,
s char(17) character set utf8, s char(17) character set utf8,
t varchar(17) character set utf8mb4, t varchar(17) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin,
w blob(10), w blob(10),
x tinyblob, x tinyblob,
y blob, y blob,
z mediumblob, z mediumblob,
aa longblob, aa longblob,
bb text(17) character set utf8, bb text(17) character set utf8,
cc tinytext character set utf8mb4, cc tinytext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin,
dd text character set utf8mb4, dd text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin,
ee mediumtext character set utf8mb4, ee mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin,
ff longtext character set utf8mb4 ff longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin
) default charset=koi8r ENGINE=InnoDB; ) default charset=koi8r ENGINE=InnoDB;
create table copy1 like orig; create table copy1 like orig;
alter table copy1 engine=columnstore; alter table copy1 engine=columnstore;
@@ -53,17 +53,17 @@ orig CREATE TABLE `orig` (
`m` datetime DEFAULT NULL, `m` datetime DEFAULT NULL,
`o` time DEFAULT NULL, `o` time DEFAULT NULL,
`s` char(17) CHARACTER SET utf8mb3 DEFAULT NULL, `s` char(17) CHARACTER SET utf8mb3 DEFAULT NULL,
`t` varchar(17) CHARACTER SET utf8mb4 DEFAULT NULL, `t` varchar(17) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
`w` tinyblob DEFAULT NULL, `w` tinyblob DEFAULT NULL,
`x` tinyblob DEFAULT NULL, `x` tinyblob DEFAULT NULL,
`y` blob DEFAULT NULL, `y` blob DEFAULT NULL,
`z` mediumblob DEFAULT NULL, `z` mediumblob DEFAULT NULL,
`aa` longblob DEFAULT NULL, `aa` longblob DEFAULT NULL,
`bb` tinytext CHARACTER SET utf8mb3 DEFAULT NULL, `bb` tinytext CHARACTER SET utf8mb3 DEFAULT NULL,
`cc` tinytext CHARACTER SET utf8mb4 DEFAULT NULL, `cc` tinytext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
`dd` text CHARACTER SET utf8mb4 DEFAULT NULL, `dd` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
`ee` mediumtext CHARACTER SET utf8mb4 DEFAULT NULL, `ee` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
`ff` longtext CHARACTER SET utf8mb4 DEFAULT NULL `ff` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=koi8r ) ENGINE=InnoDB DEFAULT CHARSET=koi8r
show create table copy1; show create table copy1;
Table Create Table Table Create Table
@@ -82,17 +82,17 @@ copy1 CREATE TABLE `copy1` (
`m` datetime DEFAULT NULL, `m` datetime DEFAULT NULL,
`o` time DEFAULT NULL, `o` time DEFAULT NULL,
`s` char(17) CHARACTER SET utf8mb3 DEFAULT NULL, `s` char(17) CHARACTER SET utf8mb3 DEFAULT NULL,
`t` varchar(17) CHARACTER SET utf8mb4 DEFAULT NULL, `t` varchar(17) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
`w` tinyblob DEFAULT NULL, `w` tinyblob DEFAULT NULL,
`x` tinyblob DEFAULT NULL, `x` tinyblob DEFAULT NULL,
`y` blob DEFAULT NULL, `y` blob DEFAULT NULL,
`z` mediumblob DEFAULT NULL, `z` mediumblob DEFAULT NULL,
`aa` longblob DEFAULT NULL, `aa` longblob DEFAULT NULL,
`bb` tinytext CHARACTER SET utf8mb3 DEFAULT NULL, `bb` tinytext CHARACTER SET utf8mb3 DEFAULT NULL,
`cc` tinytext CHARACTER SET utf8mb4 DEFAULT NULL, `cc` tinytext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
`dd` text CHARACTER SET utf8mb4 DEFAULT NULL, `dd` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
`ee` mediumtext CHARACTER SET utf8mb4 DEFAULT NULL, `ee` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
`ff` longtext CHARACTER SET utf8mb4 DEFAULT NULL `ff` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL
) ENGINE=Columnstore DEFAULT CHARSET=koi8r ) ENGINE=Columnstore DEFAULT CHARSET=koi8r
show create table copy2; show create table copy2;
Table Create Table Table Create Table
@@ -111,17 +111,17 @@ copy2 CREATE TABLE `copy2` (
`m` datetime DEFAULT NULL, `m` datetime DEFAULT NULL,
`o` time DEFAULT NULL, `o` time DEFAULT NULL,
`s` char(17) CHARACTER SET utf8mb3 DEFAULT NULL, `s` char(17) CHARACTER SET utf8mb3 DEFAULT NULL,
`t` varchar(17) CHARACTER SET utf8mb4 DEFAULT NULL, `t` varchar(17) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
`w` tinyblob DEFAULT NULL, `w` tinyblob DEFAULT NULL,
`x` tinyblob DEFAULT NULL, `x` tinyblob DEFAULT NULL,
`y` blob DEFAULT NULL, `y` blob DEFAULT NULL,
`z` mediumblob DEFAULT NULL, `z` mediumblob DEFAULT NULL,
`aa` longblob DEFAULT NULL, `aa` longblob DEFAULT NULL,
`bb` tinytext CHARACTER SET utf8mb3 DEFAULT NULL, `bb` tinytext CHARACTER SET utf8mb3 DEFAULT NULL,
`cc` tinytext CHARACTER SET utf8mb4 DEFAULT NULL, `cc` tinytext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
`dd` text CHARACTER SET utf8mb4 DEFAULT NULL, `dd` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
`ee` mediumtext CHARACTER SET utf8mb4 DEFAULT NULL, `ee` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
`ff` longtext CHARACTER SET utf8mb4 DEFAULT NULL `ff` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL
) ENGINE=Columnstore DEFAULT CHARSET=koi8r ) ENGINE=Columnstore DEFAULT CHARSET=koi8r
show create table copy3; show create table copy3;
Table Create Table Table Create Table
@@ -140,17 +140,17 @@ copy3 CREATE TABLE `copy3` (
`m` datetime DEFAULT NULL, `m` datetime DEFAULT NULL,
`o` time DEFAULT NULL, `o` time DEFAULT NULL,
`s` char(17) DEFAULT NULL, `s` char(17) DEFAULT NULL,
`t` varchar(17) CHARACTER SET utf8mb4 DEFAULT NULL, `t` varchar(17) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
`w` tinyblob DEFAULT NULL, `w` tinyblob DEFAULT NULL,
`x` tinyblob DEFAULT NULL, `x` tinyblob DEFAULT NULL,
`y` blob DEFAULT NULL, `y` blob DEFAULT NULL,
`z` mediumblob DEFAULT NULL, `z` mediumblob DEFAULT NULL,
`aa` longblob DEFAULT NULL, `aa` longblob DEFAULT NULL,
`bb` tinytext DEFAULT NULL, `bb` tinytext DEFAULT NULL,
`cc` tinytext CHARACTER SET utf8mb4 DEFAULT NULL, `cc` tinytext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
`dd` text CHARACTER SET utf8mb4 DEFAULT NULL, `dd` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
`ee` mediumtext CHARACTER SET utf8mb4 DEFAULT NULL, `ee` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
`ff` longtext CHARACTER SET utf8mb4 DEFAULT NULL `ff` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci ) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
drop table orig; drop table orig;
drop table copy1; drop table copy1;

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

@@ -2,7 +2,6 @@
#Test column length with different charsets #Test column length with different charsets
# #
--source ../include/disable_before_10.9.inc
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
-- source include/have_innodb.inc -- source include/have_innodb.inc
--source ../include/charset.inc --source ../include/charset.inc
@@ -47,17 +46,17 @@ create table orig (a integer not null,
m datetime, m datetime,
o time, o time,
s char(17) character set utf8, s char(17) character set utf8,
t varchar(17) character set utf8mb4, t varchar(17) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin,
w blob(10), w blob(10),
x tinyblob, x tinyblob,
y blob, y blob,
z mediumblob, z mediumblob,
aa longblob, aa longblob,
bb text(17) character set utf8, bb text(17) character set utf8,
cc tinytext character set utf8mb4, cc tinytext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin,
dd text character set utf8mb4, dd text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin,
ee mediumtext character set utf8mb4, ee mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin,
ff longtext character set utf8mb4 ff longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin
) default charset=koi8r ENGINE=InnoDB; ) default charset=koi8r ENGINE=InnoDB;
create table copy1 like orig; create table copy1 like orig;