diff options
| author | unknown <stewart@willster.(none)> | 2006-08-15 19:10:10 +0800 |
|---|---|---|
| committer | unknown <stewart@willster.(none)> | 2006-08-15 19:10:10 +0800 |
| commit | e884c5babc31968a4176315c393eb09914ee3653 (patch) | |
| tree | 9a6bacf0b760670de7d57f8169329b6486ec546b | |
| parent | 6633a291671150cd1840790b3226b0d970a14aac (diff) | |
| download | mariadb-git-e884c5babc31968a4176315c393eb09914ee3653.tar.gz | |
BUG#21650 not_embedded_server fails --with-ndbcluster
make test ignore NDB injector thread
mysql-test/r/not_embedded_server.result:
Use INFORMATION_SCHEMA for getting PROCESSLIST so we can exclude the
NDB Binlog Injector thread as it may/may not be running depending on
if --with-ndbcluster is specified to mysql-test-run
mysql-test/t/not_embedded_server.test:
Use INFORMATION_SCHEMA for getting PROCESSLIST so we can exclude the
NDB Binlog Injector thread as it may/may not be running depending on
if --with-ndbcluster is specified to mysql-test-run
| -rw-r--r-- | mysql-test/r/not_embedded_server.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/not_embedded_server.test | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/mysql-test/r/not_embedded_server.result b/mysql-test/r/not_embedded_server.result index 7cbe91b3753..fc49469ae74 100644 --- a/mysql-test/r/not_embedded_server.result +++ b/mysql-test/r/not_embedded_server.result @@ -1,6 +1,6 @@ -prepare stmt1 from ' show full processlist '; +prepare stmt1 from ' SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND!=\'Daemon\' '; execute stmt1; -Id User Host db Command Time State Info +ID USER HOST DB COMMAND TIME STATE INFO +number root localhost test Query time preparing SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND!='Daemon' number event_scheduler localhost NULL Connect time Suspended NULL -number root localhost test Query time NULL show full processlist deallocate prepare stmt1; diff --git a/mysql-test/t/not_embedded_server.test b/mysql-test/t/not_embedded_server.test index 83ec03d6706..5beee5967a3 100644 --- a/mysql-test/t/not_embedded_server.test +++ b/mysql-test/t/not_embedded_server.test @@ -9,10 +9,15 @@ # To not show other connections, this must be the first test and we must # have a server restart before this one # +# We don't have any 4.1 tests as we use I_S to query the PROCESSLIST to +# exclude system threads that may/may not be active in the server +# (namely the ndb injector thread) +# +# End of 4.1 tests -prepare stmt1 from ' show full processlist '; +prepare stmt1 from ' SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND!=\'Daemon\' '; --replace_column 1 number 6 time 3 localhost execute stmt1; deallocate prepare stmt1; -# End of 4.1 tests +# End of 5.1 tests |