database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-21462 main.processlist_notembedded fails to clean up

Browse Source 
Replace the 30-second sleep in the test with proper
DEBUG_SYNC interlocking.
This commit is contained in:
Marko Mäkelä
2020-05-06 11:51:44 +03:00
parent 6a31aea5a1
commit 459e8619f2
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/r/processlist_notembedded.result
View File

@ -1,7 +1,8 @@
# #
# MDEV-20466: SHOW PROCESSLIST truncates query text on \0 bytes # 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'; SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
SET DEBUG_SYNC= 'now SIGNAL go';
SET DEBUG_SYNC = 'RESET'; SET DEBUG_SYNC = 'RESET';
End of 5.5 tests End of 5.5 tests

9
mysql-test/t/processlist_notembedded.test
View File

@ -1,6 +1,7 @@
source include/have_debug.inc; source include/have_debug.inc;
source include/have_debug_sync.inc; source include/have_debug_sync.inc;
source include/not_embedded.inc; source include/not_embedded.inc;
source include/count_sessions.inc;
--echo # --echo #
--echo # MDEV-20466: SHOW PROCESSLIST truncates query text on \0 bytes --echo # MDEV-20466: SHOW PROCESSLIST truncates query text on \0 bytes
@ -10,9 +11,9 @@ connect (con1,localhost,root,,);
connection con1; 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 sleep FROM mysql.user WHERE user ='some", CHAR(0), "'")`;
SET DEBUG_SYNC= 'before_join_optimize SIGNAL in_sync'; SET DEBUG_SYNC= 'before_join_optimize SIGNAL in_sync WAIT_FOR go';
--disable_query_log --disable_query_log
--send_eval $q; --send_eval $q;
--enable_query_log --enable_query_log
@ -27,8 +28,12 @@ let SEARCH_PATTERN=sleep;
source include/search_pattern_in_file.inc; source include/search_pattern_in_file.inc;
remove_file $MYSQLTEST_VARDIR/tmp//MDEV-20466.text; remove_file $MYSQLTEST_VARDIR/tmp//MDEV-20466.text;
SET DEBUG_SYNC= 'now SIGNAL go';
disconnect con1; disconnect con1;
SET DEBUG_SYNC = 'RESET'; SET DEBUG_SYNC = 'RESET';
source include/wait_until_count_sessions.inc;
--echo End of 5.5 tests --echo End of 5.5 tests