diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-05-09 20:20:02 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-05-09 20:20:02 +0200 |
| commit | 607467bd63db2c6ca64610eb9f4e703711f4dfc6 (patch) | |
| tree | 207950367562dbb11f5e3d1789b05db44366f7c7 /mysql-test/main/processlist_notembedded.test | |
| parent | 1a9c593db8046a48b47db045915c6cce7f11e9ec (diff) | |
| parent | 985f63cce1057d7b3fd6e86e65a2a2ee7d970073 (diff) | |
| download | mariadb-git-607467bd63db2c6ca64610eb9f4e703711f4dfc6.tar.gz | |
Merge branch '10.2' into 10.3mariadb-10.3.23
Diffstat (limited to 'mysql-test/main/processlist_notembedded.test')
| -rw-r--r-- | mysql-test/main/processlist_notembedded.test | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/mysql-test/main/processlist_notembedded.test b/mysql-test/main/processlist_notembedded.test index 2dc6a0539ab..4979e40a85a 100644 --- a/mysql-test/main/processlist_notembedded.test +++ b/mysql-test/main/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 @@ -23,12 +24,16 @@ SET DEBUG_SYNC= 'now WAIT_FOR in_sync'; exec $MYSQL test -e "SHOW PROCESSLIST" > $MYSQLTEST_VARDIR/tmp/MDEV-20466.text; let SEARCH_FILE=$MYSQLTEST_VARDIR/tmp/MDEV-20466.text; -let SEARCH_PATTERN=sleep \(30\); +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 |