bk commit into 5.1 tree (tomas:1.1832)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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
  1.1832 05/05/09 16:03:45 tomas@stripped +4 -0
  not_ndb.inc, ps_process_list.test, ps_process_list.result, not_ndb.require:
    new file

  mysql-test/include/not_ndb.inc
    1.1 05/05/09 16:02:58 tomas@stripped +7 -0

  mysql-test/include/not_ndb.inc
    1.0 05/05/09 16:02:58 tomas@stripped +0 -0
    BitKeeper file /home/tomas/wl2325/mysql-test/include/not_ndb.inc

  mysql-test/t/ps_process_list.test
    1.1 05/05/09 16:02:48 tomas@stripped +8 -0

  mysql-test/t/ps_process_list.test
    1.0 05/05/09 16:02:48 tomas@stripped +0 -0
    BitKeeper file /home/tomas/wl2325/mysql-test/t/ps_process_list.test

  mysql-test/r/ps_process_list.result
    1.1 05/05/09 16:02:40 tomas@stripped +4 -0

  mysql-test/r/ps_process_list.result
    1.0 05/05/09 16:02:40 tomas@stripped +0 -0
    BitKeeper file /home/tomas/wl2325/mysql-test/r/ps_process_list.result

  mysql-test/r/not_ndb.require
    1.1 05/05/09 16:02:31 tomas@stripped +2 -0

  mysql-test/r/not_ndb.require
    1.0 05/05/09 16:02:31 tomas@stripped +0 -0
    BitKeeper file /home/tomas/wl2325/mysql-test/r/not_ndb.require

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/wl2325
--- New file ---
+++ mysql-test/include/not_ndb.inc	05/05/09 16:02:58
-- require r/not_ndb.require
disable_query_log;
# so that both DISABLED and NO is output as NO
-- replace_result DISABLED NO
show variables like "have_ndbcluster";
enable_query_log;


--- New file ---
+++ mysql-test/r/not_ndb.require	05/05/09 16:02:31
Variable_name	Value
have_ndbcluster	NO

--- New file ---
+++ mysql-test/r/ps_process_list.result	05/05/09 16:02:40
prepare stmt4 from ' show full processlist ';
execute stmt4;
Id	User	Host	db	Command	Time	State	Info
number	root	localhost	test	Query	time	NULL	show full processlist

--- New file ---
+++ mysql-test/t/ps_process_list.test	05/05/09 16:02:48
# Can't test process with embedded server
-- source include/not_embedded.inc
-- source include/not_ndb.inc

prepare stmt4 from ' show full processlist ';
--replace_column 1 number 6 time 3 localhost
execute stmt4;