database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-10-31 18:30:33 +03:00
Code Activity

Merge branch 'stable-23.10' into feat/MCOL-6072-parallel-scan-4-CES-4

Browse Source
This commit is contained in:
drrtuy
2025-09-04 15:47:40 +00:00
parent 8c0c85080c 77c3aea6eb
commit ed2c89196b
49 changed files with 1371 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/columnstore/autopilot/t/mcs4010_autopilot_cross_engine_join.test
View File

@@ -4,6 +4,7 @@
# Author: Daniel Lee, daniel.lee@mariadb.com
# -------------------------------------------------------------- #
#
--source ../include/disable_for_11.4_and_later.inc
--source ../include/have_columnstore.inc
--source ../include/detect_maxscale.inc
#

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

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

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

@@ -46,17 +46,17 @@ create table orig (a integer not null,
m datetime,
o time,
s char(17) character set utf8,
t varchar(17) character set utf8mb4,
t varchar(17) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin,
w blob(10),
x tinyblob,
y blob,
z mediumblob,
aa longblob,
bb text(17) character set utf8,
cc tinytext character set utf8mb4,
dd text character set utf8mb4,
ee mediumtext character set utf8mb4,
ff longtext character set utf8mb4
cc tinytext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin,
dd text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin,
ee mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin,
ff longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin
) default charset=koi8r ENGINE=InnoDB;
create table copy1 like orig;

1
mysql-test/columnstore/devregression/t/mcs7134_regression_bug3997.test
View File

@@ -4,6 +4,7 @@
# Author: Daniel Lee, daniel.lee@mariadb.com
# -------------------------------------------------------------- #
#
--source ../include/disable_for_11.4_and_later.inc
--source ../include/have_columnstore.inc
#
USE tpch1;

1
mysql-test/columnstore/devregression/t/mcs7135_regression_bug3998.test
View File

@@ -4,6 +4,7 @@
# Author: Daniel Lee, daniel.lee@mariadb.com
# -------------------------------------------------------------- #
#
--source ../include/disable_for_11.4_and_later.inc
--source ../include/have_columnstore.inc
#
USE tpch1;

1
mysql-test/columnstore/devregression/t/mcs7136_regression_bug4027.test
View File

@@ -4,6 +4,7 @@
# Author: Daniel Lee, daniel.lee@mariadb.com
# -------------------------------------------------------------- #
#
--source ../include/disable_for_11.4_and_later.inc
--source ../include/have_columnstore.inc
#
USE tpch1;

4
mysql-test/columnstore/include/disable_for_11.4_and_later.inc Normal file
View File

@@ -0,0 +1,4 @@
if (`SELECT (sys.version_major(), sys.version_minor(), sys.version_patch()) >= (11, 4, 0)`)
{
skip Known multiupdate bug;
}