From 058510a62ff9056223685d2bc544c6bff13d226f Mon Sep 17 00:00:00 2001 From: Monty Date: Mon, 26 Feb 2024 13:01:38 +0200 Subject: [PATCH] Moved test for online alter in connect to separate test This was needed as mtr --embedded connect.alter failed as online is ignored for embedder server. This fixes a wrong commit 30c965f8664cd0aad44847c0b99b618d385c2ffe --- storage/connect/mysql-test/connect/r/alter.result | 8 -------- .../mysql-test/connect/r/alter_not_embedded.result | 8 ++++++++ storage/connect/mysql-test/connect/t/alter.test | 8 -------- .../connect/mysql-test/connect/t/alter_not_embedded.test | 9 +++++++++ 4 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 storage/connect/mysql-test/connect/r/alter_not_embedded.result create mode 100644 storage/connect/mysql-test/connect/t/alter_not_embedded.test diff --git a/storage/connect/mysql-test/connect/r/alter.result b/storage/connect/mysql-test/connect/r/alter.result index 342d7c72791..09f4584a75e 100644 --- a/storage/connect/mysql-test/connect/r/alter.result +++ b/storage/connect/mysql-test/connect/r/alter.result @@ -272,11 +272,3 @@ line 2Two 3Three DROP TABLE t1, t2; -# MDEV-31777 ER_GET_ERRNO upon online alter with concurrent DML on -# CONNECT table -CREATE TABLE t (a INT) ENGINE=CONNECT TABLE_TYPE=DOS; -Warnings: -Warning 1105 No file name. Table will use t.dos -ALTER TABLE t FORCE, ALGORITHM=COPY, LOCK=NONE; -ERROR 0A000: LOCK=NONE is not supported. Reason: CONNECT. Try LOCK=SHARED -DROP TABLE t; diff --git a/storage/connect/mysql-test/connect/r/alter_not_embedded.result b/storage/connect/mysql-test/connect/r/alter_not_embedded.result new file mode 100644 index 00000000000..fd2387f910f --- /dev/null +++ b/storage/connect/mysql-test/connect/r/alter_not_embedded.result @@ -0,0 +1,8 @@ +# MDEV-31777 ER_GET_ERRNO upon online alter with concurrent DML on +# CONNECT table +CREATE TABLE t (a INT) ENGINE=CONNECT TABLE_TYPE=DOS; +Warnings: +Warning 1105 No file name. Table will use t.dos +ALTER TABLE t FORCE, ALGORITHM=COPY, LOCK=NONE; +ERROR 0A000: LOCK=NONE is not supported. Reason: CONNECT. Try LOCK=SHARED +DROP TABLE t; diff --git a/storage/connect/mysql-test/connect/t/alter.test b/storage/connect/mysql-test/connect/t/alter.test index 18688a37934..0eda6355027 100644 --- a/storage/connect/mysql-test/connect/t/alter.test +++ b/storage/connect/mysql-test/connect/t/alter.test @@ -133,14 +133,6 @@ SELECT * from t2; DROP TABLE t1, t2; - ---echo # MDEV-31777 ER_GET_ERRNO upon online alter with concurrent DML on ---echo # CONNECT table -CREATE TABLE t (a INT) ENGINE=CONNECT TABLE_TYPE=DOS; ---error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON -ALTER TABLE t FORCE, ALGORITHM=COPY, LOCK=NONE; -DROP TABLE t; - # # Clean up # diff --git a/storage/connect/mysql-test/connect/t/alter_not_embedded.test b/storage/connect/mysql-test/connect/t/alter_not_embedded.test new file mode 100644 index 00000000000..c2a7382a7bc --- /dev/null +++ b/storage/connect/mysql-test/connect/t/alter_not_embedded.test @@ -0,0 +1,9 @@ +# Disable test for embedded as 'online' is ignored +--source include/not_embedded.inc + +--echo # MDEV-31777 ER_GET_ERRNO upon online alter with concurrent DML on +--echo # CONNECT table +CREATE TABLE t (a INT) ENGINE=CONNECT TABLE_TYPE=DOS; +--error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON +ALTER TABLE t FORCE, ALGORITHM=COPY, LOCK=NONE; +DROP TABLE t;