From 2d400d919d5b36a2e38382b16abb7facf8d8df64 Mon Sep 17 00:00:00 2001 From: Timofey Turenko Date: Thu, 19 Jun 2025 15:02:46 +0300 Subject: [PATCH] add have_inndb to MTR --- mysql-test/columnstore/basic/r/mcol641-aggregate.result | 2 +- ...COL-5886-use-of-partitioned-tables-in-crossengine-steps.test | 2 ++ mysql-test/columnstore/basic/t/mcs22_insert_ignore.test | 1 + mysql-test/columnstore/basic/t/mcs_named_udfs.test | 2 ++ mysql-test/columnstore/bugfixes/mcol_4622.test | 1 + 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mysql-test/columnstore/basic/r/mcol641-aggregate.result b/mysql-test/columnstore/basic/r/mcol641-aggregate.result index b16f2123d..bf2ec4f80 100644 --- a/mysql-test/columnstore/basic/r/mcol641-aggregate.result +++ b/mysql-test/columnstore/basic/r/mcol641-aggregate.result @@ -497,4 +497,4 @@ DROP TABLE cs2; DROP TABLE cs3; DROP TABLE cs4; DROP TABLE cs5; -DROP DATABASE IF EXISTS test_mcol641_aggregate; +DROP DATABASE test_mcol641_aggregate; diff --git a/mysql-test/columnstore/basic/t/MCOL-5886-use-of-partitioned-tables-in-crossengine-steps.test b/mysql-test/columnstore/basic/t/MCOL-5886-use-of-partitioned-tables-in-crossengine-steps.test index 64ff80efa..ea4726ca9 100644 --- a/mysql-test/columnstore/basic/t/MCOL-5886-use-of-partitioned-tables-in-crossengine-steps.test +++ b/mysql-test/columnstore/basic/t/MCOL-5886-use-of-partitioned-tables-in-crossengine-steps.test @@ -1,3 +1,5 @@ +-- source ../include/have_columnstore.inc +--source include/have_innodb.inc --disable_warnings DROP DATABASE IF EXISTS MCOL5886; --enable_warnings diff --git a/mysql-test/columnstore/basic/t/mcs22_insert_ignore.test b/mysql-test/columnstore/basic/t/mcs22_insert_ignore.test index b0120cf5e..8e15e1b6f 100644 --- a/mysql-test/columnstore/basic/t/mcs22_insert_ignore.test +++ b/mysql-test/columnstore/basic/t/mcs22_insert_ignore.test @@ -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 mcs22_db; diff --git a/mysql-test/columnstore/basic/t/mcs_named_udfs.test b/mysql-test/columnstore/basic/t/mcs_named_udfs.test index d8ab21388..84859b2c6 100644 --- a/mysql-test/columnstore/basic/t/mcs_named_udfs.test +++ b/mysql-test/columnstore/basic/t/mcs_named_udfs.test @@ -1,4 +1,6 @@ -- source ../include/have_columnstore.inc +--source ../include/functions.inc + --disable_warnings DROP DATABASE IF EXISTS cal_test_db; diff --git a/mysql-test/columnstore/bugfixes/mcol_4622.test b/mysql-test/columnstore/bugfixes/mcol_4622.test index 862f43239..b4b164fad 100644 --- a/mysql-test/columnstore/bugfixes/mcol_4622.test +++ b/mysql-test/columnstore/bugfixes/mcol_4622.test @@ -1,4 +1,5 @@ -- source ../include/have_columnstore.inc +--source include/have_innodb.inc --disable_warnings DROP DATABASE IF EXISTS mcol_4622; --enable_warnings