Skip to content

Commit c9b5280

Browse files
committed
MDEV-20466: fix of embedded test suite
1 parent b7bc8c3 commit c9b5280

File tree

4 files changed

+41
-35
lines changed

4 files changed

+41
-35
lines changed

mysql-test/r/processlist.result

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,4 @@ select command, time < 5 from information_schema.processlist where id != connect
1717
command time < 5
1818
Sleep 1
1919
set debug_sync='reset';
20-
#
21-
# MDEV-20466: SHOW PROCESSLIST truncates query text on \0 bytes
22-
#
23-
SET DEBUG_SYNC= 'before_join_optimize SIGNAL in_sync';
24-
SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
25-
SET DEBUG_SYNC = 'RESET';
2620
End of 5.5 tests
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#
2+
# MDEV-20466: SHOW PROCESSLIST truncates query text on \0 bytes
3+
#
4+
SET DEBUG_SYNC= 'before_join_optimize SIGNAL in_sync';
5+
SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
6+
SET DEBUG_SYNC = 'RESET';
7+
End of 5.5 tests

mysql-test/t/processlist.test

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -51,33 +51,4 @@ select command, time < 5 from information_schema.processlist where id != connect
5151
disconnect con1;
5252
set debug_sync='reset';
5353

54-
--echo #
55-
--echo # MDEV-20466: SHOW PROCESSLIST truncates query text on \0 bytes
56-
--echo #
57-
58-
connect (con1,localhost,root,,);
59-
60-
connection con1;
61-
62-
let $q= `select CONCAT("SELECT user FROM mysql.user WHERE user ='some", CHAR(0), "' or sleep (30)")`;
63-
64-
SET DEBUG_SYNC= 'before_join_optimize SIGNAL in_sync';
65-
--disable_query_log
66-
--send_eval $q;
67-
--enable_query_log
68-
connection default;
69-
70-
SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
71-
72-
exec $MYSQL test -e "SHOW PROCESSLIST" > $MYSQLTEST_VARDIR/tmp/MDEV-20466.text;
73-
74-
let SEARCH_FILE=$MYSQLTEST_VARDIR/tmp/MDEV-20466.text;
75-
let SEARCH_PATTERN=sleep;
76-
source include/search_pattern_in_file.inc;
77-
remove_file $MYSQLTEST_VARDIR/tmp//MDEV-20466.text;
78-
79-
disconnect con1;
80-
81-
SET DEBUG_SYNC = 'RESET';
82-
8354
--echo End of 5.5 tests
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
source include/have_debug.inc;
2+
source include/have_debug_sync.inc;
3+
source include/not_embedded.inc;
4+
5+
--echo #
6+
--echo # MDEV-20466: SHOW PROCESSLIST truncates query text on \0 bytes
7+
--echo #
8+
9+
connect (con1,localhost,root,,);
10+
11+
connection con1;
12+
13+
let $q= `select CONCAT("SELECT user FROM mysql.user WHERE user ='some", CHAR(0), "' or sleep (30)")`;
14+
15+
SET DEBUG_SYNC= 'before_join_optimize SIGNAL in_sync';
16+
--disable_query_log
17+
--send_eval $q;
18+
--enable_query_log
19+
connection default;
20+
21+
SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
22+
23+
exec $MYSQL test -e "SHOW PROCESSLIST" > $MYSQLTEST_VARDIR/tmp/MDEV-20466.text;
24+
25+
let SEARCH_FILE=$MYSQLTEST_VARDIR/tmp/MDEV-20466.text;
26+
let SEARCH_PATTERN=sleep;
27+
source include/search_pattern_in_file.inc;
28+
remove_file $MYSQLTEST_VARDIR/tmp//MDEV-20466.text;
29+
30+
disconnect con1;
31+
32+
SET DEBUG_SYNC = 'RESET';
33+
34+
--echo End of 5.5 tests

0 commit comments

Comments
 (0)