diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-20 08:41:52 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-20 08:41:52 +0200 |
commit | bc43bf3e430c20bc2178e584215bd443054709d6 (patch) | |
tree | 4e0406551bb2162c110c1120dbe272e4d9ed2fda | |
parent | 9be5c19c3458963ccf82450b198567976275d599 (diff) | |
parent | ceffabc421fa9473c0d0e55b038103bcf76e3bef (diff) | |
download | mariadb-git-bc43bf3e430c20bc2178e584215bd443054709d6.tar.gz |
Merge 10.2 into 10.3
-rw-r--r-- | mysql-test/suite/innodb/r/innodb_wl6326.result | 13 | ||||
-rw-r--r-- | mysql-test/suite/innodb/t/innodb_wl6326.test | 24 | ||||
-rw-r--r-- | mysql-test/suite/innodb_gis/t/rtree_rollback1.test | 3 | ||||
-rw-r--r-- | mysql-test/suite/innodb_gis/t/rtree_rollback2.test | 3 |
4 files changed, 21 insertions, 22 deletions
diff --git a/mysql-test/suite/innodb/r/innodb_wl6326.result b/mysql-test/suite/innodb/r/innodb_wl6326.result index a53f1238e1d..e0574a6b7b1 100644 --- a/mysql-test/suite/innodb/r/innodb_wl6326.result +++ b/mysql-test/suite/innodb/r/innodb_wl6326.result @@ -1,4 +1,3 @@ -DROP TABLE IF EXISTS t1; SET GLOBAL innodb_adaptive_hash_index = false; SET GLOBAL innodb_stats_persistent = false; connect con1,localhost,root,,; @@ -281,8 +280,8 @@ connection con3; SET DEBUG_SYNC = 'rw_s_lock_waiting SIGNAL lockwait2'; SELECT a00,a01 FROM t1 WHERE a00 = 'cn'; connection default; -SET DEBUG_SYNC = 'now WAIT_FOR lockwait1'; -SET DEBUG_SYNC = 'now WAIT_FOR lockwait2'; +SET DEBUG_SYNC = 'now WAIT_FOR lockwait1 TIMEOUT 1'; +SET DEBUG_SYNC = 'now WAIT_FOR lockwait2 TIMEOUT 1'; SET DEBUG_SYNC = 'now SIGNAL continue'; connection con1; connection con2; @@ -311,8 +310,8 @@ connection con3; SET DEBUG_SYNC = 'rw_s_lock_waiting SIGNAL lockwait2'; SELECT a00,a01 FROM t1 WHERE a00 = 'el'; connection default; -SET DEBUG_SYNC = 'now WAIT_FOR lockwait1'; -SET DEBUG_SYNC = 'now WAIT_FOR lockwait2'; +SET DEBUG_SYNC = 'now WAIT_FOR lockwait1 TIMEOUT 1'; +SET DEBUG_SYNC = 'now WAIT_FOR lockwait2 TIMEOUT 1'; SET DEBUG_SYNC = 'now SIGNAL continue'; connection con1; connection con2; @@ -347,8 +346,8 @@ connection con3; SET DEBUG_SYNC = 'rw_s_lock_waiting SIGNAL lockwait2'; SELECT a00,a01 FROM t1 WHERE a00 = 'gb'; connection default; -SET DEBUG_SYNC = 'now WAIT_FOR lockwait1'; -SET DEBUG_SYNC = 'now WAIT_FOR lockwait2'; +SET DEBUG_SYNC = 'now WAIT_FOR lockwait1 TIMEOUT 1'; +SET DEBUG_SYNC = 'now WAIT_FOR lockwait2 TIMEOUT 1'; SET DEBUG_SYNC = 'now SIGNAL continue'; connection con1; connection con2; diff --git a/mysql-test/suite/innodb/t/innodb_wl6326.test b/mysql-test/suite/innodb/t/innodb_wl6326.test index 70a0d861885..71eba94be04 100644 --- a/mysql-test/suite/innodb/t/innodb_wl6326.test +++ b/mysql-test/suite/innodb/t/innodb_wl6326.test @@ -12,9 +12,6 @@ SET @old_innodb_limit_optimistic_insert_debug = @@innodb_limit_optimistic_insert SET @old_innodb_adaptive_hash_index = @@innodb_adaptive_hash_index; SET @old_innodb_stats_persistent = @@innodb_stats_persistent; --enable_query_log ---disable_warnings -DROP TABLE IF EXISTS t1; ---enable_warnings # Save the initial number of concurrent sessions --source include/count_sessions.inc @@ -353,8 +350,11 @@ SET DEBUG_SYNC = 'rw_s_lock_waiting SIGNAL lockwait2'; SELECT a00,a01 FROM t1 WHERE a00 = 'cn'; --connection default -SET DEBUG_SYNC = 'now WAIT_FOR lockwait1'; -SET DEBUG_SYNC = 'now WAIT_FOR lockwait2'; +# FIXME: These occasionally time out! +--disable_warnings +SET DEBUG_SYNC = 'now WAIT_FOR lockwait1 TIMEOUT 1'; +SET DEBUG_SYNC = 'now WAIT_FOR lockwait2 TIMEOUT 1'; +--enable_warnings SET DEBUG_SYNC = 'now SIGNAL continue'; --connection con1 @@ -407,8 +407,11 @@ SET DEBUG_SYNC = 'rw_s_lock_waiting SIGNAL lockwait2'; SELECT a00,a01 FROM t1 WHERE a00 = 'el'; --connection default -SET DEBUG_SYNC = 'now WAIT_FOR lockwait1'; -SET DEBUG_SYNC = 'now WAIT_FOR lockwait2'; +# FIXME: These occasionally time out! +--disable_warnings +SET DEBUG_SYNC = 'now WAIT_FOR lockwait1 TIMEOUT 1'; +SET DEBUG_SYNC = 'now WAIT_FOR lockwait2 TIMEOUT 1'; +--enable_warnings SET DEBUG_SYNC = 'now SIGNAL continue'; --connection con1 @@ -461,8 +464,11 @@ SET DEBUG_SYNC = 'rw_s_lock_waiting SIGNAL lockwait2'; SELECT a00,a01 FROM t1 WHERE a00 = 'gb'; --connection default -SET DEBUG_SYNC = 'now WAIT_FOR lockwait1'; -SET DEBUG_SYNC = 'now WAIT_FOR lockwait2'; +# FIXME: These occasionally time out! +--disable_warnings +SET DEBUG_SYNC = 'now WAIT_FOR lockwait1 TIMEOUT 1'; +SET DEBUG_SYNC = 'now WAIT_FOR lockwait2 TIMEOUT 1'; +--enable_warnings SET DEBUG_SYNC = 'now SIGNAL continue'; --connection con1 diff --git a/mysql-test/suite/innodb_gis/t/rtree_rollback1.test b/mysql-test/suite/innodb_gis/t/rtree_rollback1.test index 123bccf76a1..3dea75bc026 100644 --- a/mysql-test/suite/innodb_gis/t/rtree_rollback1.test +++ b/mysql-test/suite/innodb_gis/t/rtree_rollback1.test @@ -1,9 +1,6 @@ # WL#6745 InnoDB R-tree support # This test case will test R-tree split. -# Not supported in embedded ---source include/not_embedded.inc - --source include/have_innodb.inc --source include/big_test.inc --source include/not_valgrind.inc diff --git a/mysql-test/suite/innodb_gis/t/rtree_rollback2.test b/mysql-test/suite/innodb_gis/t/rtree_rollback2.test index cddbaf5592d..78b251bd696 100644 --- a/mysql-test/suite/innodb_gis/t/rtree_rollback2.test +++ b/mysql-test/suite/innodb_gis/t/rtree_rollback2.test @@ -1,9 +1,6 @@ # WL#6745 InnoDB R-tree support # This test case will test R-tree split. -# Not supported in embedded ---source include/not_embedded.inc - --source include/have_innodb.inc --source include/big_test.inc --source include/not_valgrind.inc |