diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-05-06 20:24:08 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-05-06 20:24:08 +0200 |
| commit | 10aaa77509869153b998898d46943ec0949b5784 (patch) | |
| tree | 58c180a46c072fa0c7da0a428d483559576c9732 | |
| parent | 9c5d06a6d3c1861ed1bb96670a19ac1bdb6c5b7d (diff) | |
| parent | f20c63264ab4170fc8e45093042bd2e7272ce9fc (diff) | |
| download | mariadb-git-10aaa77509869153b998898d46943ec0949b5784.tar.gz | |
Merge branch '5.5' into 10.1
| -rw-r--r-- | mysql-test/r/processlist_notembedded.result | 3 | ||||
| -rw-r--r-- | mysql-test/t/processlist_notembedded.test | 9 |
2 files changed, 9 insertions, 3 deletions
diff --git a/mysql-test/r/processlist_notembedded.result b/mysql-test/r/processlist_notembedded.result index e6b30f3ec70..d7f38b69d9b 100644 --- a/mysql-test/r/processlist_notembedded.result +++ b/mysql-test/r/processlist_notembedded.result @@ -1,8 +1,9 @@ # # MDEV-20466: SHOW PROCESSLIST truncates query text on \0 bytes # -SET DEBUG_SYNC= 'before_join_optimize SIGNAL in_sync'; +SET DEBUG_SYNC= 'before_join_optimize SIGNAL in_sync WAIT_FOR go'; SET DEBUG_SYNC= 'now WAIT_FOR in_sync'; FOUND /sleep/ in MDEV-20466.text +SET DEBUG_SYNC= 'now SIGNAL go'; 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 dc970cf5709..b07ac00a44a 100644 --- a/mysql-test/t/processlist_notembedded.test +++ b/mysql-test/t/processlist_notembedded.test @@ -1,6 +1,7 @@ source include/have_debug.inc; source include/have_debug_sync.inc; source include/not_embedded.inc; +source include/count_sessions.inc; --echo # --echo # MDEV-20466: SHOW PROCESSLIST truncates query text on \0 bytes @@ -10,9 +11,9 @@ connect (con1,localhost,root,,); connection con1; -let $q= `select CONCAT("SELECT user FROM mysql.user WHERE user ='some", CHAR(0), "' or sleep (30)")`; +let $q= `select CONCAT("SELECT user FROM mysql.user WHERE user ='some", CHAR(0), "sleep'")`; -SET DEBUG_SYNC= 'before_join_optimize SIGNAL in_sync'; +SET DEBUG_SYNC= 'before_join_optimize SIGNAL in_sync WAIT_FOR go'; --disable_query_log --send_eval $q; --enable_query_log @@ -27,8 +28,12 @@ let SEARCH_PATTERN=sleep; source include/search_pattern_in_file.inc; remove_file $MYSQLTEST_VARDIR/tmp//MDEV-20466.text; +SET DEBUG_SYNC= 'now SIGNAL go'; + disconnect con1; SET DEBUG_SYNC = 'RESET'; +source include/wait_until_count_sessions.inc; + --echo End of 5.5 tests |