diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-27 10:47:05 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-27 10:47:05 +0300 |
| commit | dd7e9fb38a71064992a12ca58b5366f48b21e0b4 (patch) | |
| tree | a54297ecad1604c37c6d8bf8e5b53757f89ea5e1 /storage | |
| parent | 01d757036f5753fbbb54c6fef4bd7b312981ed88 (diff) | |
| download | mariadb-git-dd7e9fb38a71064992a12ca58b5366f48b21e0b4.tar.gz | |
MDEV-28854 after-merge fix: Remove a test for MDEV-26583
Diffstat (limited to 'storage')
3 files changed, 0 insertions, 81 deletions
diff --git a/storage/spider/mysql-test/spider/bugfix/r/mdev_26583.result b/storage/spider/mysql-test/spider/bugfix/r/mdev_26583.result deleted file mode 100644 index 0ce268af7e3..00000000000 --- a/storage/spider/mysql-test/spider/bugfix/r/mdev_26583.result +++ /dev/null @@ -1,34 +0,0 @@ -# -# MDEV-26583 SIGSEGV's in spider_get_select_limit_from_select_lex when DELAYED INSERT is used -# -for master_1 -for child2 -child2_1 -child2_2 -child2_3 -for child3 -connection child2_1; -CREATE DATABASE auto_test_remote; -USE auto_test_remote; -CREATE TABLE tbl_a ( -a INT AUTO_INCREMENT KEY, -b INT,INDEX i (b) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; -connection master_1; -CREATE DATABASE auto_test_local; -USE auto_test_local; -CREATE TABLE tbl_a ( -a INT AUTO_INCREMENT KEY, -b INT,INDEX i (b) -) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='srv "s_2_1", table "tbl_a"'; -INSERT DELAYED INTO tbl_a VALUES (0,0),(0,0),(0,0); -connection master_1; -DROP DATABASE auto_test_local; -connection child2_1; -DROP DATABASE auto_test_remote; -for master_1 -for child2 -child2_1 -child2_2 -child2_3 -for child3 diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_26583.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_26583.cnf deleted file mode 100644 index 05dfd8a0bce..00000000000 --- a/storage/spider/mysql-test/spider/bugfix/t/mdev_26583.cnf +++ /dev/null @@ -1,3 +0,0 @@ -!include include/default_mysqld.cnf -!include ../my_1_1.cnf -!include ../my_2_1.cnf diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_26583.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_26583.test deleted file mode 100644 index e4a2d64ba6d..00000000000 --- a/storage/spider/mysql-test/spider/bugfix/t/mdev_26583.test +++ /dev/null @@ -1,44 +0,0 @@ ---echo # ---echo # MDEV-26583 SIGSEGV's in spider_get_select_limit_from_select_lex when DELAYED INSERT is used ---echo # - ---disable_query_log ---disable_result_log ---source ../../t/test_init.inc ---enable_result_log ---enable_query_log - ---connection child2_1 -CREATE DATABASE auto_test_remote; -USE auto_test_remote; - -eval CREATE TABLE tbl_a ( - a INT AUTO_INCREMENT KEY, - b INT,INDEX i (b) -) $CHILD2_1_ENGINE $CHILD2_1_CHARSET; - ---connection master_1 -CREATE DATABASE auto_test_local; -USE auto_test_local; - -eval CREATE TABLE tbl_a ( - a INT AUTO_INCREMENT KEY, - b INT,INDEX i (b) -) $MASTER_1_ENGINE $MASTER_1_CHARSET COMMENT='srv "s_2_1", table "tbl_a"'; - -INSERT DELAYED INTO tbl_a VALUES (0,0),(0,0),(0,0); - -let $wait_condition=select count(*)=3 from tbl_a -source include/wait_condition.inc; - ---connection master_1 -DROP DATABASE auto_test_local; - ---connection child2_1 -DROP DATABASE auto_test_remote; - ---disable_query_log ---disable_result_log ---source ../../t/test_deinit.inc ---enable_result_log ---enable_query_log |