summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Malyavin <nikitamalyavin@gmail.com>2019-09-10 14:54:31 +0300
committerNikita Malyavin <nikitamalyavin@gmail.com>2019-09-10 16:14:50 +0300
commitacf0f2d59270ce8acc20e09c9c4d95091f13045f (patch)
tree93cc5c595ef976eff90ec352ef5143d43e9f5f35
parent879c9ddce7fd89f06f538e380016b408e4f2a2f4 (diff)
downloadmariadb-git-acf0f2d59270ce8acc20e09c9c4d95091f13045f.tar.gz
MDEV-20143 innodb.innodb-virtual-columns-debug failed in buildbot with wrong result
there was a SELECT/DELETE race
-rw-r--r--mysql-test/suite/innodb/r/innodb-virtual-columns-debug.result2
-rw-r--r--mysql-test/suite/innodb/t/innodb-virtual-columns-debug.test2
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/innodb/r/innodb-virtual-columns-debug.result b/mysql-test/suite/innodb/r/innodb-virtual-columns-debug.result
index efe43945c69..df6bf83d24f 100644
--- a/mysql-test/suite/innodb/r/innodb-virtual-columns-debug.result
+++ b/mysql-test/suite/innodb/r/innodb-virtual-columns-debug.result
@@ -6,11 +6,11 @@ SET debug_sync= "ib_open_after_dict_open SIGNAL delete_open WAIT_FOR another_ope
DELETE FROM t1;
connection default;
SET debug_sync= "now WAIT_FOR delete_open";
-SET debug_sync= "ib_open_after_dict_open SIGNAL another_open";
SELECT a FROM t1;
a
NULL
NULL
+SET debug_sync= "now SIGNAL another_open";
connection con1;
disconnect con1;
connection default;
diff --git a/mysql-test/suite/innodb/t/innodb-virtual-columns-debug.test b/mysql-test/suite/innodb/t/innodb-virtual-columns-debug.test
index 6de43dd80f8..d4947ca4d8b 100644
--- a/mysql-test/suite/innodb/t/innodb-virtual-columns-debug.test
+++ b/mysql-test/suite/innodb/t/innodb-virtual-columns-debug.test
@@ -15,8 +15,8 @@ SET debug_sync= "ib_open_after_dict_open SIGNAL delete_open WAIT_FOR another_ope
DELETE FROM t1;
--connection default
SET debug_sync= "now WAIT_FOR delete_open";
-SET debug_sync= "ib_open_after_dict_open SIGNAL another_open";
SELECT a FROM t1;
+SET debug_sync= "now SIGNAL another_open";
--connection con1
--reap