MDEV-20466: fix of test suite

MariaDB · Oct 15, 2019 · b7bc8c3 · b7bc8c3
1 parent 4ba763d
commit b7bc8c3
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 35 deletions.
diff --git a/mysql-test/r/processlist.result b/mysql-test/r/processlist.result
@@ -17,4 +17,10 @@ select command, time < 5 from information_schema.processlist where id != connect
 command	time < 5
 Sleep	1
 set debug_sync='reset';
+#
+# MDEV-20466: SHOW PROCESSLIST truncates query text on \0 bytes
+#
+SET DEBUG_SYNC= 'before_join_optimize SIGNAL in_sync';
+SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
+SET DEBUG_SYNC = 'RESET';
 End of 5.5 tests
diff --git a/mysql-test/r/processlist_MDEV-20466.result b/mysql-test/r/processlist_MDEV-20466.result
diff --git a/mysql-test/t/processlist.test b/mysql-test/t/processlist.test
@@ -51,4 +51,33 @@ select command, time < 5 from information_schema.processlist where id != connect
 disconnect con1;
 set debug_sync='reset';
 
+--echo #
+--echo # MDEV-20466: SHOW PROCESSLIST truncates query text on \0 bytes
+--echo #
+
+connect (con1,localhost,root,,);
+
+connection con1;
+
+let $q= `select CONCAT("SELECT user FROM mysql.user WHERE user ='some", CHAR(0), "' or sleep (30)")`;
+
+SET DEBUG_SYNC= 'before_join_optimize SIGNAL in_sync';
+--disable_query_log
+--send_eval $q;
+--enable_query_log
+connection default;
+
+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;
+source include/search_pattern_in_file.inc;
+remove_file $MYSQLTEST_VARDIR/tmp//MDEV-20466.text;
+
+disconnect con1;
+
+SET DEBUG_SYNC = 'RESET';
+
 --echo End of 5.5 tests
diff --git a/mysql-test/t/processlist_MDEV-20466.test b/mysql-test/t/processlist_MDEV-20466.test