diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-10-19 10:01:26 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-10-19 10:01:26 +0200 |
| commit | c9b5280371b0ceddb9a805f0bc4cd5265d9fab86 (patch) | |
| tree | 14f12aad6ed37965f13c208cb48136caa06ec6f7 | |
| parent | b7bc8c3fcbe718717934b404963305c6772a5c23 (diff) | |
| download | mariadb-git-c9b5280371b0ceddb9a805f0bc4cd5265d9fab86.tar.gz | |
MDEV-20466: fix of embedded test suite
| -rw-r--r-- | mysql-test/r/processlist.result | 6 | ||||
| -rw-r--r-- | mysql-test/r/processlist_notembedded.result | 7 | ||||
| -rw-r--r-- | mysql-test/t/processlist.test | 29 | ||||
| -rw-r--r-- | mysql-test/t/processlist_notembedded.test | 34 |
4 files changed, 41 insertions, 35 deletions
diff --git a/mysql-test/r/processlist.result b/mysql-test/r/processlist.result index 24802cb2425..55d2425d269 100644 --- a/mysql-test/r/processlist.result +++ b/mysql-test/r/processlist.result @@ -17,10 +17,4 @@ 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_notembedded.result b/mysql-test/r/processlist_notembedded.result new file mode 100644 index 00000000000..f5b2a310813 --- /dev/null +++ b/mysql-test/r/processlist_notembedded.result @@ -0,0 +1,7 @@ +# +# 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/t/processlist.test b/mysql-test/t/processlist.test index 52cb6b31919..8a8995f43b0 100644 --- a/mysql-test/t/processlist.test +++ b/mysql-test/t/processlist.test @@ -51,33 +51,4 @@ 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_notembedded.test b/mysql-test/t/processlist_notembedded.test new file mode 100644 index 00000000000..dc970cf5709 --- /dev/null +++ b/mysql-test/t/processlist_notembedded.test @@ -0,0 +1,34 @@ +source include/have_debug.inc; +source include/have_debug_sync.inc; +source include/not_embedded.inc; + +--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 |