From 91d308d8d1eac55143c86079f98044f471ad9f1a Mon Sep 17 00:00:00 2001 From: "aleksei.bukhalov" Date: Mon, 4 Aug 2025 15:54:45 +0200 Subject: [PATCH] fix(tests): disable tests for 11.4 due to known bug --- .../autopilot/t/mcs4010_autopilot_cross_engine_join.test | 1 + mysql-test/columnstore/basic/t/mcol_2000.test | 1 + .../devregression/t/mcs7134_regression_bug3997.test | 1 + .../devregression/t/mcs7135_regression_bug3998.test | 1 + .../devregression/t/mcs7136_regression_bug4027.test | 1 + mysql-test/columnstore/include/disable_for_11.4_and_later.inc | 4 ++++ 6 files changed, 9 insertions(+) create mode 100644 mysql-test/columnstore/include/disable_for_11.4_and_later.inc diff --git a/mysql-test/columnstore/autopilot/t/mcs4010_autopilot_cross_engine_join.test b/mysql-test/columnstore/autopilot/t/mcs4010_autopilot_cross_engine_join.test index 4649a4d2f..a15980d1c 100755 --- a/mysql-test/columnstore/autopilot/t/mcs4010_autopilot_cross_engine_join.test +++ b/mysql-test/columnstore/autopilot/t/mcs4010_autopilot_cross_engine_join.test @@ -4,6 +4,7 @@ # Author: Daniel Lee, daniel.lee@mariadb.com # -------------------------------------------------------------- # # +--source ../include/disable_for_11.4_and_later.inc --source ../include/have_columnstore.inc --source ../include/detect_maxscale.inc # diff --git a/mysql-test/columnstore/basic/t/mcol_2000.test b/mysql-test/columnstore/basic/t/mcol_2000.test index 5dc47ad55..4440a777b 100644 --- a/mysql-test/columnstore/basic/t/mcol_2000.test +++ b/mysql-test/columnstore/basic/t/mcol_2000.test @@ -2,6 +2,7 @@ #Test column length with different charsets # +--source ../include/disable_before_10.9.inc -- source ../include/have_columnstore.inc -- source include/have_innodb.inc --source ../include/charset.inc diff --git a/mysql-test/columnstore/devregression/t/mcs7134_regression_bug3997.test b/mysql-test/columnstore/devregression/t/mcs7134_regression_bug3997.test index 63c23bf5d..12edd67c0 100644 --- a/mysql-test/columnstore/devregression/t/mcs7134_regression_bug3997.test +++ b/mysql-test/columnstore/devregression/t/mcs7134_regression_bug3997.test @@ -4,6 +4,7 @@ # Author: Daniel Lee, daniel.lee@mariadb.com # -------------------------------------------------------------- # # +--source ../include/disable_for_11.4_and_later.inc --source ../include/have_columnstore.inc # USE tpch1; diff --git a/mysql-test/columnstore/devregression/t/mcs7135_regression_bug3998.test b/mysql-test/columnstore/devregression/t/mcs7135_regression_bug3998.test index fec8f605e..757460e7a 100644 --- a/mysql-test/columnstore/devregression/t/mcs7135_regression_bug3998.test +++ b/mysql-test/columnstore/devregression/t/mcs7135_regression_bug3998.test @@ -4,6 +4,7 @@ # Author: Daniel Lee, daniel.lee@mariadb.com # -------------------------------------------------------------- # # +--source ../include/disable_for_11.4_and_later.inc --source ../include/have_columnstore.inc # USE tpch1; diff --git a/mysql-test/columnstore/devregression/t/mcs7136_regression_bug4027.test b/mysql-test/columnstore/devregression/t/mcs7136_regression_bug4027.test index 1d04ad609..923aef3fa 100644 --- a/mysql-test/columnstore/devregression/t/mcs7136_regression_bug4027.test +++ b/mysql-test/columnstore/devregression/t/mcs7136_regression_bug4027.test @@ -4,6 +4,7 @@ # Author: Daniel Lee, daniel.lee@mariadb.com # -------------------------------------------------------------- # # +--source ../include/disable_for_11.4_and_later.inc --source ../include/have_columnstore.inc # USE tpch1; diff --git a/mysql-test/columnstore/include/disable_for_11.4_and_later.inc b/mysql-test/columnstore/include/disable_for_11.4_and_later.inc new file mode 100644 index 000000000..744b16155 --- /dev/null +++ b/mysql-test/columnstore/include/disable_for_11.4_and_later.inc @@ -0,0 +1,4 @@ +if (`SELECT (sys.version_major(), sys.version_minor(), sys.version_patch()) >= (11, 4, 0)`) +{ + skip Known multiupdate bug; +}