diff options
author | Monty <monty@mariadb.org> | 2020-05-22 19:10:56 +0300 |
---|---|---|
committer | Monty <monty@mariadb.org> | 2020-05-23 12:29:10 +0300 |
commit | fc8359f0ac7764aa70b2e415da604e2ff0581628 (patch) | |
tree | 1cdcd31d0c1b5881b77ad05d16bece47470ca902 | |
parent | c779ef26b6eed4c9305218d340593fcadab0a47b (diff) | |
download | mariadb-git-fc8359f0ac7764aa70b2e415da604e2ff0581628.tar.gz |
Fixed failure in flush_read_lock.test
The failure was:
mysqltest: At line 1737: query 'reap' failed: 1397: XAER_NOTA: Unknown XID
The bug was in the test case int that it executed REAP XA COMMIT before
the connection had truly disconnected
-rw-r--r-- | mysql-test/main/flush_read_lock.result | 2 | ||||
-rw-r--r-- | mysql-test/main/flush_read_lock.test | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/main/flush_read_lock.result b/mysql-test/main/flush_read_lock.result index be710050139..f7fca14506e 100644 --- a/mysql-test/main/flush_read_lock.result +++ b/mysql-test/main/flush_read_lock.result @@ -1391,9 +1391,11 @@ insert into t3_trans values (2); xa end 'test2'; xa prepare 'test2'; # Disconnect temporary connection +set debug_sync='thread_end SIGNAL detached'; disconnect con_tmp; # Switching to connection 'con1'. connection con1; +set debug_sync='now WAIT_FOR detached'; flush tables with read lock; # Switching to connection 'default'. connection default; diff --git a/mysql-test/main/flush_read_lock.test b/mysql-test/main/flush_read_lock.test index 4283358770c..9d60aba58ba 100644 --- a/mysql-test/main/flush_read_lock.test +++ b/mysql-test/main/flush_read_lock.test @@ -1698,9 +1698,11 @@ insert into t3_trans values (2); xa end 'test2'; xa prepare 'test2'; --echo # Disconnect temporary connection +set debug_sync='thread_end SIGNAL detached'; disconnect con_tmp; --echo # Switching to connection '$con_aux1'. connection $con_aux1; +set debug_sync='now WAIT_FOR detached'; flush tables with read lock; --echo # Switching to connection 'default'. connection default; |