bk commit into 4.1 tree (holyfoot:1.2528)

[holyfoot]

Below is the list of changes that have just been committed into a local
4.1 repository of hf. When hf 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.2528 06/07/03 14:54:09 holyfoot@deer.(none) +2 -0
  bug 20317 (test fails in embedded for different number of threads is
  running)
  
  I decided to make ps_1general test independent from actual number of
  threads running

  mysql-test/t/ps_1general.test
    1.16 06/07/03 14:49:46 holyfoot@stripped +1 -0
    as i think we don't really care about the number of threads running
    i just replace the number with '#'

  mysql-test/r/ps_1general.result
    1.24 06/07/03 14:49:46 holyfoot@stripped +1 -1
    result fixed

# 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:	holyfoot
# Host:	deer.(none)
# Root:	/home/hf/work/mysql-4.1.20317

--- 1.23/mysql-test/r/ps_1general.result	Fri Sep  9 13:22:12 2005
+++ 1.24/mysql-test/r/ps_1general.result	Mon Jul  3 14:49:46 2006
@@ -282,7 +282,7 @@
 prepare stmt4 from ' show status like ''Threads_running'' ';
 execute stmt4;
 Variable_name	Value
-Threads_running	1
+Threads_running	#
 prepare stmt4 from ' show variables like ''sql_mode'' ';
 execute stmt4;
 Variable_name	Value

--- 1.15/mysql-test/t/ps_1general.test	Thu Jul 28 05:21:46 2005
+++ 1.16/mysql-test/t/ps_1general.test	Mon Jul  3 14:49:46 2006
@@ -305,6 +305,7 @@
 --replace_result 2147483647 4294967295
 # Bug#4288
 execute stmt4;
+--replace_column 2 #
 prepare stmt4 from ' show status like ''Threads_running'' ';
 execute stmt4;
 prepare stmt4 from ' show variables like ''sql_mode'' ';