Commit e884c5ba authored by unknown's avatar unknown

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
parent 6633a291
prepare stmt1 from ' show full processlist '; prepare stmt1 from ' SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND!=\'Daemon\' ';
execute stmt1; 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 event_scheduler localhost NULL Connect time Suspended NULL
number root localhost test Query time NULL show full processlist
deallocate prepare stmt1; deallocate prepare stmt1;
...@@ -9,10 +9,15 @@ ...@@ -9,10 +9,15 @@
# To not show other connections, this must be the first test and we must # To not show other connections, this must be the first test and we must
# have a server restart before this one # 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 --replace_column 1 number 6 time 3 localhost
execute stmt1; execute stmt1;
deallocate prepare stmt1; deallocate prepare stmt1;
# End of 4.1 tests # End of 5.1 tests
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment