diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-18 08:40:19 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-18 08:40:19 +0300 |
| commit | ca3f497564f93d2d70d024d996bcd1136bddc5ab (patch) | |
| tree | c89f50b5dd0f2a23d6c1511844c5196909bc5325 /mysql-test/main | |
| parent | 9f03a394fff4ae55553eb694f7cba56db15fdb7b (diff) | |
| parent | b9a2e4609f93f2cab253f02bc7535960852de3c5 (diff) | |
| download | mariadb-git-ca3f497564f93d2d70d024d996bcd1136bddc5ab.tar.gz | |
Merge 10.2 into 10.3, except MDEV-25682
Diffstat (limited to 'mysql-test/main')
| -rw-r--r-- | mysql-test/main/commit_1innodb.result | 2 | ||||
| -rw-r--r-- | mysql-test/main/mdev_22370.result | 4 | ||||
| -rw-r--r-- | mysql-test/main/mdev_22370.test | 17 |
3 files changed, 22 insertions, 1 deletions
diff --git a/mysql-test/main/commit_1innodb.result b/mysql-test/main/commit_1innodb.result index 7d21540b548..a7b544dc282 100644 --- a/mysql-test/main/commit_1innodb.result +++ b/mysql-test/main/commit_1innodb.result @@ -874,7 +874,7 @@ Table Op Msg_type Msg_text test.t1 check status OK test.t2 check status OK test.t3 check status OK -call p_verify_status_increment(6, 0, 6, 0); +call p_verify_status_increment(4, 0, 4, 0); SUCCESS commit; diff --git a/mysql-test/main/mdev_22370.result b/mysql-test/main/mdev_22370.result new file mode 100644 index 00000000000..d422ee6e81f --- /dev/null +++ b/mysql-test/main/mdev_22370.result @@ -0,0 +1,4 @@ +connect con1,localhost,root,,; +SET DEBUG_DBUG='+d,mark_busy_mdev_22370'; +FLUSH TABLES WITH READ LOCK; +connection default; diff --git a/mysql-test/main/mdev_22370.test b/mysql-test/main/mdev_22370.test new file mode 100644 index 00000000000..86bc527ebc0 --- /dev/null +++ b/mysql-test/main/mdev_22370.test @@ -0,0 +1,17 @@ +# +# MDEV-22370 safe_mutex: Trying to lock uninitialized mutex at +# /data/src/10.4-bug/sql/rpl_parallel.cc, line 470 upon shutdown during FTWRL +# +# Purpose of this test case to test crash while FTWRL and shutdown is in race +# condition +# Shutdown can execute first and destroy the mutex making mutex_lock in pool_mark_busy +# to crash + +--source include/have_debug.inc +--connect (con1,localhost,root,,) +SET DEBUG_DBUG='+d,mark_busy_mdev_22370'; +--send + FLUSH TABLES WITH READ LOCK; + +--connection default +--source include/restart_mysqld.inc |