From 20bb1b3031daf2c08431898a24cd35dba0bb4212 Mon Sep 17 00:00:00 2001
From: Alexander Barkov <bar@mariadb.com>
Date: Thu, 3 Jun 2021 11:12:05 +0400
Subject: [PATCH] MCOL-4748 mtr mcs229_data_compression_type fails without
 --extern

---
 mysql-test/columnstore/basic/suite.pm         |  2 ++
 .../basic/t/mcs229_data_compression_type.test | 24 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/mysql-test/columnstore/basic/suite.pm b/mysql-test/columnstore/basic/suite.pm
index 85d9a5e0c..93a24238c 100644
--- a/mysql-test/columnstore/basic/suite.pm
+++ b/mysql-test/columnstore/basic/suite.pm
@@ -9,11 +9,13 @@ if (-d $mcs_bin_dir_compiled)
 {
   $ENV{MCS_MCSSETCONFIG}=$mcs_bin_dir_compiled . "/mcsSetConfig";
   $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)
 {
   $ENV{MCS_MCSSETCONFIG}=$mcs_ins_dir_installed . "/mcsSetConfig";
   $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 }
diff --git a/mysql-test/columnstore/basic/t/mcs229_data_compression_type.test b/mysql-test/columnstore/basic/t/mcs229_data_compression_type.test
index cfc26cb1a..21e954a07 100644
--- a/mysql-test/columnstore/basic/t/mcs229_data_compression_type.test
+++ b/mysql-test/columnstore/basic/t/mcs229_data_compression_type.test
@@ -4,6 +4,20 @@
 #
 -- 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
 DROP DATABASE IF EXISTS mcs229_db;
 --enable_warnings
@@ -37,3 +51,13 @@ SELECT `schema`, tablename, columnname, compressiontype FROM calpontsys.syscolum
 
 # Clean UP
 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