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

Merge pull request #1967 from mariadb-corporation/bar-develop-MCOL-4748

Browse Source 
MCOL-4748 mtr mcs229_data_compression_type fails without --extern
This commit is contained in:
Alexander Barkov
2021-06-04 09:03:44 +04:00
committed by GitHub
parent 911a41f5be 20bb1b3031
commit 107e417715
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/columnstore/basic/suite.pm
View File

@ -9,11 +9,13 @@ if (-d $mcs_bin_dir_compiled)
{ {
$ENV{MCS_MCSSETCONFIG}=$mcs_bin_dir_compiled . "/mcsSetConfig"; $ENV{MCS_MCSSETCONFIG}=$mcs_bin_dir_compiled . "/mcsSetConfig";
$ENV{MCS_CPIMPORT}=$mcs_bin_dir_compiled . "/cpimport"; $ENV{MCS_CPIMPORT}=$mcs_bin_dir_compiled . "/cpimport";
$ENV{MCS_SYSCATALOG_MYSQL_SQL}=$::mysqld_variables{'basedir'} . "/storage/columnstore/columnstore/dbcon/mysql/syscatalog_mysql.sql";
} }
elsif (-d $mcs_ins_dir_installed) elsif (-d $mcs_ins_dir_installed)
{ {
$ENV{MCS_MCSSETCONFIG}=$mcs_ins_dir_installed . "/mcsSetConfig"; $ENV{MCS_MCSSETCONFIG}=$mcs_ins_dir_installed . "/mcsSetConfig";
$ENV{MCS_CPIMPORT}=$mcs_ins_dir_installed . "/cpimport"; $ENV{MCS_CPIMPORT}=$mcs_ins_dir_installed . "/cpimport";
$ENV{MCS_SYSCATALOG_MYSQL_SQL}=$::mysqld_variables{'basedir'} . "/share/columnstore/syscatalog_mysql.sql";
} }
sub is_default { 0 } sub is_default { 0 }

24
mysql-test/columnstore/basic/t/mcs229_data_compression_type.test
View File

@ -4,6 +4,20 @@
# #
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
#
# If the calpontsys database does not exist, let's create it.
# It's possible if we're running mtr without --extern.
#
let $calpontsys_exits=`SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='calpontsys' AND TABLE_NAME='syscolumn';`;
--disable_query_log
if (!$calpontsys_exits)
{
--exec $MYSQL < $MCS_SYSCATALOG_MYSQL_SQL
use test;
}
--enable_query_log
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs229_db; DROP DATABASE IF EXISTS mcs229_db;
--enable_warnings --enable_warnings
@ -37,3 +51,13 @@ SELECT `schema`, tablename, columnname, compressiontype FROM calpontsys.syscolum
# Clean UP # Clean UP
DROP DATABASE mcs229_db; DROP DATABASE mcs229_db;
--disable_query_log
if (!$calpontsys_exits)
{
drop table calpontsys.systable restrict;
drop table calpontsys.syscolumn restrict;
drop database calpontsys;
}
--enable_query_log