bk commit into 5.1 tree (stewart:1.2274) BUG#21650

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-08-15 19:10:10+08:00, stewart@willster.(none) +2 -0
  BUG#21650 not_embedded_server fails --with-ndbcluster
  
  make test ignore NDB injector thread

  mysql-test/r/not_embedded_server.result@stripped, 2006-08-15 19:10:07+08:00, stewart@willster.(none) +3 -3
    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@stripped, 2006-08-15 19:10:07+08:00, stewart@willster.(none) +7 -2
    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

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.1/ndb

--- 1.5/mysql-test/r/not_embedded_server.result	2006-08-15 19:10:15 +08:00
+++ 1.6/mysql-test/r/not_embedded_server.result	2006-08-15 19:10:15 +08:00
@@ -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;

--- 1.2/mysql-test/t/not_embedded_server.test	2006-08-15 19:10:15 +08:00
+++ 1.3/mysql-test/t/not_embedded_server.test	2006-08-15 19:10:15 +08:00
@@ -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