Skip to content

Commit 7465919

Browse files
timofeyturenkomariadb-LeonidFedorov
timofeyturenko
authored and
mariadb-LeonidFedorov
committed
Make mcs11_show_db_table, mcs12_alter_table, mcs1_create_table_data_types compatible tests with 11.4
1 parent 5d3a95b commit 7465919

13 files changed

+659
-3
lines changed

‎mysql-test/columnstore/basic/r/mcs11_show_db_table_11.4.result‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
DROP DATABASE IF EXISTS mcs11_db1;
2+
DROP DATABASE IF EXISTS mcs11_db2;
3+
CREATE DATABASE mcs11_db1;
4+
CREATE SCHEMA mcs11_db2;
5+
SHOW DATABASES LIKE 'mcs11%';
6+
Database (mcs11%)
7+
mcs11_db1
8+
mcs11_db2
9+
SHOW SCHEMAS LIKE 'mcs11%';
10+
Database (mcs11%)
11+
mcs11_db1
12+
mcs11_db2
13+
SHOW TABLES IN mcs11_db1;
14+
Tables_in_mcs11_db1
15+
USE mcs11_db2;
16+
SHOW TABLES;
17+
Tables_in_mcs11_db2
18+
CREATE TABLE mcs11_db1.t1 (id INT) engine=innodb;
19+
CREATE TABLE mcs11_db1.t2 (id INT) engine=columnstore;
20+
SHOW TABLES IN mcs11_db1;
21+
Tables_in_mcs11_db1
22+
t1
23+
t2
24+
USE mcs11_db1;
25+
SHOW TABLES;
26+
Tables_in_mcs11_db1
27+
t1
28+
t2
29+
USE mcs11_db2;
30+
CREATE TABLE t1 (id INT) engine=innodb;
31+
CREATE TABLE t2 (id INT) engine=columnstore;
32+
CREATE TEMPORARY TABLE tmp1 (id INT) engine=innodb;
33+
CREATE TEMPORARY TABLE tmp1 (id INT) engine=columnstore;
34+
ERROR 42S01: Table 'tmp1' already exists
35+
SHOW TABLES;
36+
Tables_in_mcs11_db2
37+
t1
38+
t2
39+
tmp1
40+
SHOW TABLES IN mcs11_db2;
41+
Tables_in_mcs11_db2
42+
t1
43+
t2
44+
tmp1
45+
connection addconroot1;
46+
SHOW DATABASES LIKE 'mcs11%';
47+
Database (mcs11%)
48+
mcs11_db1
49+
mcs11_db2
50+
SHOW TABLES IN mcs11_db1;
51+
Tables_in_mcs11_db1
52+
t1
53+
t2
54+
USE mcs11_db1;
55+
SHOW TABLES;
56+
Tables_in_mcs11_db1
57+
t1
58+
t2
59+
connection addconroot2;
60+
SHOW SCHEMAS LIKE 'mcs11%';
61+
Database (mcs11%)
62+
mcs11_db1
63+
mcs11_db2
64+
SHOW TABLES IN mcs11_db2;
65+
Tables_in_mcs11_db2
66+
t1
67+
t2
68+
USE mcs11_db2;
69+
SHOW TABLES;
70+
Tables_in_mcs11_db2
71+
t1
72+
t2
73+
connection default;
74+
disconnect addconroot1;
75+
disconnect addconroot2;
76+
DROP DATABASE IF EXISTS mcs11_db1;
77+
DROP DATABASE IF EXISTS mcs11_db2;

‎mysql-test/columnstore/basic/r/mcs12_alter_table_11.4.result‎

Lines changed: 152 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,152 @@
1+
DROP DATABASE IF EXISTS mcs12_db1;
2+
DROP DATABASE IF EXISTS mcs12_db2;
3+
CREATE DATABASE mcs12_db1;
4+
CREATE DATABASE mcs12_db2;
5+
USE mcs12_db1;
6+
CREATE TABLE t1 (a INTEGER, c1 CHAR(10));
7+
INSERT INTO t1 VALUES (1, 'a'),(2, 'b');
8+
ALTER TABLE t1 ENGINE=Columnstore;
9+
ALTER TABLE t1 ENGINE=INNODB;
10+
INSERT INTO t1 VALUES (3, 'c'),(4, 'd');
11+
ALTER TABLE mcs12_db1.t1 ENGINE=Columnstore;
12+
INSERT INTO mcs12_db1.t1 VALUES (3, 'c'),(4, 'd');
13+
SHOW CREATE TABLE mcs12_db1.t1;
14+
Table Create Table
15+
t1 CREATE TABLE `t1` (
16+
`a` int(11) DEFAULT NULL,
17+
`c1` char(10) DEFAULT NULL
18+
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
19+
SELECT * FROM mcs12_db1.t1;
20+
a c1
21+
1 a
22+
2 b
23+
3 c
24+
4 d
25+
3 c
26+
4 d
27+
SHOW CREATE TABLE t1;
28+
Table Create Table
29+
t1 CREATE TABLE `t1` (
30+
`a` int(11) DEFAULT NULL,
31+
`c1` char(10) DEFAULT NULL
32+
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
33+
SELECT * FROM t1;
34+
a c1
35+
1 a
36+
2 b
37+
3 c
38+
4 d
39+
3 c
40+
4 d
41+
ALTER TABLE t1 RENAME t2;
42+
SHOW CREATE TABLE t2;
43+
Table Create Table
44+
t2 CREATE TABLE `t2` (
45+
`a` int(11) DEFAULT NULL,
46+
`c1` char(10) DEFAULT NULL
47+
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
48+
SELECT * FROM t2;
49+
a c1
50+
1 a
51+
2 b
52+
3 c
53+
4 d
54+
3 c
55+
4 d
56+
ALTER TABLE t2 RENAME TO mcs12_db1.t1;
57+
SHOW CREATE TABLE t1;
58+
Table Create Table
59+
t1 CREATE TABLE `t1` (
60+
`a` int(11) DEFAULT NULL,
61+
`c1` char(10) DEFAULT NULL
62+
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
63+
SELECT * FROM t1;
64+
a c1
65+
1 a
66+
2 b
67+
3 c
68+
4 d
69+
3 c
70+
4 d
71+
ALTER TABLE mcs12_db1.t1 RENAME TO mcs12_db2.t1;
72+
DROP TABLE mcs12_db2.t1;
73+
CREATE TABLE t1 (i INTEGER) ENGINE=Columnstore;
74+
ALTER TABLE t1 ADD COLUMN (c CHAR(10));
75+
INSERT INTO t1 VALUES (1, 'a'),(2, 'b');
76+
ALTER TABLE t1 ADD t TIMESTAMP;
77+
ALTER TABLE t1 ADD COLUMN i2 INT COMMENT 'Add one more column.';
78+
INSERT INTO t1 VALUES (1, 'a', '2020-07-08', 11);
79+
SHOW CREATE TABLE t1;
80+
Table Create Table
81+
t1 CREATE TABLE `t1` (
82+
`i` int(11) DEFAULT NULL,
83+
`c` char(10) DEFAULT NULL,
84+
`t` timestamp NULL DEFAULT NULL,
85+
`i2` int(11) DEFAULT NULL COMMENT 'Add one more column.'
86+
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
87+
ALTER TABLE t1 DROP COLUMN t;
88+
SHOW CREATE TABLE t1;
89+
Table Create Table
90+
t1 CREATE TABLE `t1` (
91+
`i` int(11) DEFAULT NULL,
92+
`c` char(10) DEFAULT NULL,
93+
`i2` int(11) DEFAULT NULL COMMENT 'Add one more column.'
94+
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
95+
SELECT * FROM t1;
96+
i c i2
97+
1 a NULL
98+
2 b NULL
99+
1 a 11
100+
ALTER TABLE t1 CHANGE i new_i INTEGER;
101+
INSERT INTO t1 VALUES (2, 'b', 22);
102+
SHOW CREATE TABLE t1;
103+
Table Create Table
104+
t1 CREATE TABLE `t1` (
105+
`new_i` int(11) DEFAULT NULL,
106+
`c` char(10) DEFAULT NULL,
107+
`i2` int(11) DEFAULT NULL COMMENT 'Add one more column.'
108+
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
109+
SELECT * FROM t1;
110+
new_i c i2
111+
1 a NULL
112+
2 b NULL
113+
1 a 11
114+
2 b 22
115+
DROP TABLE t1;
116+
CREATE TABLE t1 (i INTEGER) ENGINE=Columnstore;
117+
connection addconroot1;
118+
SHOW CREATE TABLE mcs12_db1.t1;
119+
Table Create Table
120+
t1 CREATE TABLE `t1` (
121+
`i` int(11) DEFAULT NULL
122+
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
123+
ALTER TABLE mcs12_db1.t1 ADD COLUMN c CHAR(10);
124+
INSERT INTO mcs12_db1.t1 VALUES (1, 'a'),(2, 'b');
125+
connection addconroot2;
126+
ALTER TABLE mcs12_db1.t1 ADD t TIMESTAMP;
127+
INSERT INTO mcs12_db1.t1 VALUES (3, 'c', '2020-07-08');
128+
connection addconroot1;
129+
ALTER TABLE mcs12_db1.t1 DROP COLUMN t;
130+
INSERT INTO mcs12_db1.t1 VALUES (4, 'd');
131+
connection addconroot2;
132+
ALTER TABLE mcs12_db1.t1 ADD COLUMN i2 INT COMMENT 'Add one more column.';
133+
INSERT INTO mcs12_db1.t1 VALUES (5, 'e', 55);
134+
connection default;
135+
SHOW CREATE TABLE mcs12_db1.t1;
136+
Table Create Table
137+
t1 CREATE TABLE `t1` (
138+
`i` int(11) DEFAULT NULL,
139+
`c` char(10) DEFAULT NULL,
140+
`i2` int(11) DEFAULT NULL COMMENT 'Add one more column.'
141+
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
142+
SELECT * FROM mcs12_db1.t1;
143+
i c i2
144+
1 a NULL
145+
2 b NULL
146+
3 c NULL
147+
4 d NULL
148+
5 e 55
149+
disconnect addconroot1;
150+
disconnect addconroot2;
151+
DROP DATABASE mcs12_db1;
152+
DROP DATABASE mcs12_db2;

‎mysql-test/columnstore/basic/r/mcs1_create_table_data_types_11.4.result‎

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
DROP DATABASE IF EXISTS mcs1_db;
2+
CREATE DATABASE mcs1_db;
3+
USE mcs1_db;
4+
CREATE TABLE t1
5+
(
6+
t1_BOOLEAN BOOLEAN,
7+
t1_TINYINT TINYINT,
8+
t1_TINYINT_UNSIGNED TINYINT UNSIGNED,
9+
t1_SMALLINT SMALLINT,
10+
t1_SMALLINT_UNSIGNED SMALLINT UNSIGNED,
11+
t1_MEDIUMINT MEDIUMINT,
12+
t1_MEDIUMINT_UNSIGNED MEDIUMINT UNSIGNED,
13+
t1_INT_UNSIGNED INT UNSIGNED,
14+
t1_INT INT,
15+
t1_BIGINT BIGINT,
16+
t1_BIGINT_UNSIGNED BIGINT UNSIGNED
17+
)ENGINE=Columnstore;
18+
SHOW CREATE TABLE t1;
19+
Table Create Table
20+
t1 CREATE TABLE `t1` (
21+
`t1_BOOLEAN` tinyint(1) DEFAULT NULL,
22+
`t1_TINYINT` tinyint(4) DEFAULT NULL,
23+
`t1_TINYINT_UNSIGNED` tinyint(3) unsigned DEFAULT NULL,
24+
`t1_SMALLINT` smallint(6) DEFAULT NULL,
25+
`t1_SMALLINT_UNSIGNED` smallint(5) unsigned DEFAULT NULL,
26+
`t1_MEDIUMINT` mediumint(9) DEFAULT NULL,
27+
`t1_MEDIUMINT_UNSIGNED` mediumint(8) unsigned DEFAULT NULL,
28+
`t1_INT_UNSIGNED` int(10) unsigned DEFAULT NULL,
29+
`t1_INT` int(11) DEFAULT NULL,
30+
`t1_BIGINT` bigint(20) DEFAULT NULL,
31+
`t1_BIGINT_UNSIGNED` bigint(20) unsigned DEFAULT NULL
32+
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
33+
CREATE TABLE t2
34+
(
35+
t2_DECIMAL_10_3 DECIMAL(10,3),
36+
t2_DECIMAL_10_3_UNSIGNED DECIMAL(10,3) UNSIGNED,
37+
t2_DOUBLE DOUBLE,
38+
t2_DOUBLE_UNSIGNED DOUBLE UNSIGNED,
39+
t2_FLOAT FLOAT,
40+
t2_FLOAT_UNSIGNED FLOAT UNSIGNED
41+
)ENGINE=Columnstore;
42+
SHOW CREATE TABLE t2;
43+
Table Create Table
44+
t2 CREATE TABLE `t2` (
45+
`t2_DECIMAL_10_3` decimal(10,3) DEFAULT NULL,
46+
`t2_DECIMAL_10_3_UNSIGNED` decimal(10,3) unsigned DEFAULT NULL,
47+
`t2_DOUBLE` double DEFAULT NULL,
48+
`t2_DOUBLE_UNSIGNED` double unsigned DEFAULT NULL,
49+
`t2_FLOAT` float DEFAULT NULL,
50+
`t2_FLOAT_UNSIGNED` float unsigned DEFAULT NULL
51+
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
52+
CREATE TABLE t3
53+
(
54+
t3_BLOB BLOB,
55+
t3_TINYBLOB TINYBLOB,
56+
t3_MEDIUMBLOB MEDIUMBLOB,
57+
t3_LONGBLOB LONGBLOB,
58+
t3_CHAR_100 CHAR(100),
59+
t3_VARCHAR_10 VARCHAR(10),
60+
t3_VARCHAR_500 VARCHAR(500),
61+
t3_TEXT TEXT,
62+
t3_TINYTEXT TINYTEXT,
63+
t3_MEDIUMTEXT MEDIUMTEXT,
64+
t3_LONGTEXT LONGTEXT
65+
)ENGINE=Columnstore;
66+
SHOW CREATE TABLE t3;
67+
Table Create Table
68+
t3 CREATE TABLE `t3` (
69+
`t3_BLOB` blob DEFAULT NULL,
70+
`t3_TINYBLOB` tinyblob DEFAULT NULL,
71+
`t3_MEDIUMBLOB` mediumblob DEFAULT NULL,
72+
`t3_LONGBLOB` longblob DEFAULT NULL,
73+
`t3_CHAR_100` char(100) DEFAULT NULL,
74+
`t3_VARCHAR_10` varchar(10) DEFAULT NULL,
75+
`t3_VARCHAR_500` varchar(500) DEFAULT NULL,
76+
`t3_TEXT` text DEFAULT NULL,
77+
`t3_TINYTEXT` tinytext DEFAULT NULL,
78+
`t3_MEDIUMTEXT` mediumtext DEFAULT NULL,
79+
`t3_LONGTEXT` longtext DEFAULT NULL
80+
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
81+
CREATE TABLE t4
82+
(
83+
t4_DATE DATE,
84+
t4_DATETIME DATETIME,
85+
t4_DATETIME_6 DATETIME(6),
86+
t4_TIME TIME,
87+
t4_TIME_4 TIME(4),
88+
t4_TIMESTAMP TIMESTAMP,
89+
t4_TIMESTAMP_5 TIMESTAMP(5)
90+
)ENGINE=Columnstore;
91+
SHOW CREATE TABLE t4;
92+
Table Create Table
93+
t4 CREATE TABLE `t4` (
94+
`t4_DATE` date DEFAULT NULL,
95+
`t4_DATETIME` datetime DEFAULT NULL,
96+
`t4_DATETIME_6` datetime(6) DEFAULT NULL,
97+
`t4_TIME` time DEFAULT NULL,
98+
`t4_TIME_4` time(4) DEFAULT NULL,
99+
`t4_TIMESTAMP` timestamp NULL DEFAULT NULL,
100+
`t4_TIMESTAMP_5` timestamp(5) NULL DEFAULT NULL
101+
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
102+
CREATE TABLE t5
103+
(
104+
t5_INT INT,
105+
t5_DOUBLE DOUBLE,
106+
t5_FLOAT FLOAT,
107+
t5_BLOB BLOB,
108+
t5_TEXT TEXT,
109+
t5_CHAR_100 CHAR(100),
110+
t5_DATE DATE,
111+
t5_TIME TIME,
112+
t5_TIMESTAMP TIMESTAMP
113+
)ENGINE=Columnstore;
114+
SHOW CREATE TABLE t5;
115+
Table Create Table
116+
t5 CREATE TABLE `t5` (
117+
`t5_INT` int(11) DEFAULT NULL,
118+
`t5_DOUBLE` double DEFAULT NULL,
119+
`t5_FLOAT` float DEFAULT NULL,
120+
`t5_BLOB` blob DEFAULT NULL,
121+
`t5_TEXT` text DEFAULT NULL,
122+
`t5_CHAR_100` char(100) DEFAULT NULL,
123+
`t5_DATE` date DEFAULT NULL,
124+
`t5_TIME` time DEFAULT NULL,
125+
`t5_TIMESTAMP` timestamp NULL DEFAULT NULL
126+
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
127+
DROP DATABASE mcs1_db;

‎mysql-test/columnstore/basic/t/mcs11_show_db_table.test‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
#This test verifies show databases and tables with engine=columnstore.
33
#
4-
--source ../include/disable_11.4.inc
4+
--source ../include/older_11.2.inc
55
-- source ../include/have_columnstore.inc
66
--source ../include/detect_maxscale.inc
77
-- source include/have_innodb.inc

0 commit comments

Comments
 (0)