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

MCOL-4676 ColumnStore MTR tests: missing have_innodb.inc and unpredictable default_storage_engine

Browse Source
This commit is contained in:
Alexander Barkov
2021-04-15 11:53:53 +04:00
parent 257c5f53ee
commit 625af12c63
15 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,7 @@ cc tinytext character set utf8mb4,
dd text character set utf8mb4,
ee mediumtext character set utf8mb4,
ff longtext character set utf8mb4
) default charset=koi8r;
) default charset=koi8r ENGINE=InnoDB;
create table copy1 like orig;
alter table copy1 engine=columnstore;
create table copy2 like copy1;

1
mysql-test/columnstore/basic/r/mcs12_alter_table.result
View File

@ -152,3 +152,4 @@ i c i2
disconnect addconroot1;
disconnect addconroot2;
DROP DATABASE mcs12_db1;
DROP DATABASE mcs12_db2;

4
mysql-test/columnstore/basic/r/mcs18_create_drop_users.result
View File

@ -1,3 +1,4 @@
SET default_storage_engine=InnoDB;
DROP USER IF EXISTS user1@test;
DROP USER IF EXISTS 'user2'@'%';
DROP USER IF EXISTS 'user'@'%';
@ -36,6 +37,3 @@ DROP USER 'user'@'%';
DROP USER 'user'@'localhost';
DROP USER 'user'@'127.0.0.1';
SET default_storage_engine=default;
SELECT @@default_storage_engine;
@@default_storage_engine
InnoDB

6
mysql-test/columnstore/basic/r/mcs19_grant_revoke.result
View File

@ -1,3 +1,4 @@
SET default_storage_engine=InnoDB;
DROP DATABASE IF EXISTS mcs19_db;
DROP USER IF EXISTS 'user'@'localhost';
DROP USER IF EXISTS 'user1'@'localhost';
@ -37,7 +38,7 @@ CREATE DATABASE mcs19_db;
USE mcs19_db;
CREATE DATABASE mcs19_db1;
ERROR 42000: Access denied for user 'user1'@'localhost' to database 'mcs19_db1'
CREATE TABLE t1(col INT);
CREATE TABLE t1(col INT) ENGINE=InnoDB;
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
@ -72,9 +73,6 @@ CREATE TABLE mcs19_db.t1;
ERROR 42000: CREATE command denied to user 'user1'@'localhost' for table 't1'
connection default;
SET default_storage_engine=default;
SELECT @@default_storage_engine;
@@default_storage_engine
InnoDB
DROP DATABASE mcs19_db;
DROP USER 'user'@'localhost';
DROP USER 'user1'@'localhost';

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

@ -3,6 +3,7 @@
#
-- source ../include/have_columnstore.inc
-- source include/have_innodb.inc
-- disable_warnings
drop database if exists test_mcol2000;
@ -53,7 +54,7 @@ create table orig (a integer not null,
dd text character set utf8mb4,
ee mediumtext character set utf8mb4,
ff longtext character set utf8mb4
) default charset=koi8r;
) default charset=koi8r ENGINE=InnoDB;
create table copy1 like orig;
alter table copy1 engine=columnstore;

1
mysql-test/columnstore/basic/t/mcol_4222.test
View File

@ -3,6 +3,7 @@
# Author: Bharath, bharath.bokka@mariadb.com
#
-- source ../include/have_columnstore.inc
-- source include/have_innodb.inc
--disable_warnings
DROP DATABASE IF EXISTS mcol_4222_db;

1
mysql-test/columnstore/basic/t/mcs10_drop_db_table.test
View File

@ -2,6 +2,7 @@
#This test verifies drop databases and tables with engine=columnstore.
#
-- source ../include/have_columnstore.inc
-- source include/have_innodb.inc
--disable_warnings
DROP DATABASE IF EXISTS mcs10_db1;

1
mysql-test/columnstore/basic/t/mcs11_show_db_table.test
View File

@ -2,6 +2,7 @@
#This test verifies show databases and tables with engine=columnstore.
#
-- source ../include/have_columnstore.inc
-- source include/have_innodb.inc
--disable_warnings
DROP DATABASE IF EXISTS mcs11_db1;

2
mysql-test/columnstore/basic/t/mcs12_alter_table.test
View File

@ -2,6 +2,7 @@
# Test ALTER TABLE schemas in various possible ways.
#
-- source ../include/have_columnstore.inc
-- source include/have_innodb.inc
--disable_warnings
DROP DATABASE IF EXISTS mcs12_db1;
@ -84,3 +85,4 @@ disconnect addconroot1;
disconnect addconroot2;
DROP DATABASE mcs12_db1;
DROP DATABASE mcs12_db2;

1
mysql-test/columnstore/basic/t/mcs14_truncate_table.test
View File

@ -2,6 +2,7 @@
# Test TRUNCATE TABLE in various possible scenarios.
#
-- source ../include/have_columnstore.inc
-- source include/have_innodb.inc
--disable_warnings
DROP DATABASE IF EXISTS mcs14_db1;

4
mysql-test/columnstore/basic/t/mcs18_create_drop_users.test
View File

@ -3,6 +3,9 @@
# Author: Bharath, bharath.bokka@mariadb.com
#
-- source ../include/have_columnstore.inc
-- source include/have_innodb.inc
SET default_storage_engine=InnoDB;
--disable_warnings
DROP USER IF EXISTS user1@test;
@ -45,4 +48,3 @@ DROP USER 'user'@'127.0.0.1';
# Clean up
SET default_storage_engine=default;
SELECT @@default_storage_engine;

6
mysql-test/columnstore/basic/t/mcs19_grant_revoke.test
View File

@ -3,6 +3,9 @@
# Author: Bharath, bharath.bokka@mariadb.com
#
-- source ../include/have_columnstore.inc
-- source include/have_innodb.inc
SET default_storage_engine=InnoDB;
--disable_warnings
DROP DATABASE IF EXISTS mcs19_db;
@ -37,7 +40,7 @@ CREATE DATABASE mcs19_db;
USE mcs19_db;
--error ER_DBACCESS_DENIED_ERROR
CREATE DATABASE mcs19_db1;
CREATE TABLE t1(col INT);
CREATE TABLE t1(col INT) ENGINE=InnoDB;
SHOW CREATE TABLE t1;
INSERT INTO t1 VALUES(1);
SELECT * FROM t1;
@ -63,7 +66,6 @@ CREATE TABLE mcs19_db.t1;
# Clean up
connection default;
SET default_storage_engine=default;
SELECT @@default_storage_engine;
DROP DATABASE mcs19_db;
DROP USER 'user'@'localhost';
DROP USER 'user1'@'localhost';

1
mysql-test/columnstore/basic/t/mcs24_insert_from_another_table.test
View File

@ -3,6 +3,7 @@
# Author: Bharath, bharath.bokka@mariadb.com
#
-- source ../include/have_columnstore.inc
-- source include/have_innodb.inc
--disable_warnings
DROP DATABASE IF EXISTS mcs24_db;

1
mysql-test/columnstore/basic/t/mcs51_cpimport_select_from.test
View File

@ -3,6 +3,7 @@
# Author: Susil, susil.behera@mariadb.com
#
-- source ../include/have_columnstore.inc
-- source include/have_innodb.inc
--disable_warnings
DROP DATABASE IF EXISTS mcs51_db1;

1
mysql-test/columnstore/basic/t/mcs5_create_table_from_other_tables.test
View File

@ -2,6 +2,7 @@
#Test CREATE TABLE from other tables in Columnstore
#
-- source ../include/have_columnstore.inc
-- source include/have_innodb.inc
--disable_warnings
DROP DATABASE IF EXISTS mcs5_db;