diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-26 12:23:20 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-26 12:27:51 +0300 |
| commit | 9bbd685e8d325c5868a93083addc7a930c1c90de (patch) | |
| tree | 58d1b3aeb5f867c12277ae90d8b601173e3378c0 | |
| parent | de13fccfc6b16915190cd740f7fe1e3445dff0e7 (diff) | |
| download | mariadb-git-9bbd685e8d325c5868a93083addc7a930c1c90de.tar.gz | |
MDEV-22513 main.processlist_notembedded Timeout in wait_until_count_sessions
Do not blindly disconnect the connection that is in WAIT_FOR
because it could happen that neither the disconnect nor the
SIGNAL would be processed before RESET would discard the signal.
| -rw-r--r-- | mysql-test/r/processlist_notembedded.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/processlist_notembedded.test | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/processlist_notembedded.result b/mysql-test/r/processlist_notembedded.result index ab1ced79e25..ed8509ca13c 100644 --- a/mysql-test/r/processlist_notembedded.result +++ b/mysql-test/r/processlist_notembedded.result @@ -4,5 +4,6 @@ SET DEBUG_SYNC= 'before_join_optimize SIGNAL in_sync WAIT_FOR go'; SET DEBUG_SYNC= 'now WAIT_FOR in_sync'; SET DEBUG_SYNC= 'now SIGNAL go'; +user SET DEBUG_SYNC = 'RESET'; End of 5.5 tests diff --git a/mysql-test/t/processlist_notembedded.test b/mysql-test/t/processlist_notembedded.test index b07ac00a44a..90750b40e62 100644 --- a/mysql-test/t/processlist_notembedded.test +++ b/mysql-test/t/processlist_notembedded.test @@ -30,7 +30,10 @@ remove_file $MYSQLTEST_VARDIR/tmp//MDEV-20466.text; SET DEBUG_SYNC= 'now SIGNAL go'; +connection con1; +reap; disconnect con1; +connection default; SET DEBUG_SYNC = 'RESET'; |