diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-10-15 19:28:24 +0200 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-10-15 19:28:24 +0200 |
commit | b7bc8c3fcbe718717934b404963305c6772a5c23 (patch) | |
tree | d5ee60434e545ce6b83f332921dc9687f61cbb7a /mysql-test/t | |
parent | 4ba763db77a954e355cdb90a7ef30572e2a4317b (diff) | |
download | mariadb-git-b7bc8c3fcbe718717934b404963305c6772a5c23.tar.gz |
MDEV-20466: fix of test suitebb-5.5-MDEV-20466
Diffstat (limited to 'mysql-test/t')
-rw-r--r-- | mysql-test/t/processlist.test | 29 | ||||
-rw-r--r-- | mysql-test/t/processlist_MDEV-20466.test | 35 |
2 files changed, 29 insertions, 35 deletions
diff --git a/mysql-test/t/processlist.test b/mysql-test/t/processlist.test index 8a8995f43b0..52cb6b31919 100644 --- 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 deleted file mode 100644 index 70b56d25d72..00000000000 --- a/mysql-test/t/processlist_MDEV-20466.test +++ /dev/null @@ -1,35 +0,0 @@ ---echo # This test has a result that includes \0 byte. ---echo # Such a byte makes diff to treat the whole file as binary, ---echo # and to refuse to diff it. ---echo # That's why this test is put in a separate file, ---echo # so that diff would still work on results of other tests. - -source include/have_debug.inc; -source include/have_debug_sync.inc; - ---echo # ---echo # MDEV-20466: SHOW PROCESSLIST truncates query text on \0 bytes ---echo # - -connect (con1,localhost,root,,); - -#select * from information_schema.processlist; -connection con1; - -let $q= `select CONCAT("SELECT user FROM mysql.user WHERE user ='some", CHAR(0), "' or sleep (3)")`; - -SET DEBUG_SYNC= 'before_join_optimize SIGNAL in_sync'; ---send_eval $q; - -connection default; - -SET DEBUG_SYNC= 'now WAIT_FOR in_sync'; - ---replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS -SHOW PROCESSLIST; - -disconnect con1; - -SET DEBUG_SYNC = 'RESET'; - ---echo End of 5.5 tests |