bk commit into 5.0 tree (jimw:1.1925) BUG#11233

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw 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.1925 05/08/02 16:26:38 jimw@stripped +2 -0
  Fix test to avoid spurious failure message. (Bug #11233)

  mysql-test/r/information_schema.result
    1.67 05/08/02 16:26:15 jimw@stripped +1 -1
    Update results

  mysql-test/t/information_schema.test
    1.48 05/08/02 16:26:03 jimw@stripped +2 -0
    Stub out column in results that we don't care about, and may vary

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-clean

--- 1.66/mysql-test/r/information_schema.result	2005-07-29 13:40:00 -07:00
+++ 1.67/mysql-test/r/information_schema.result	2005-08-02 16:26:15 -07:00
@@ -689,7 +689,7 @@
 Variable_name	Value
 show global status like "Threads_running";
 Variable_name	Value
-Threads_running	1
+Threads_running	#
 create table t1(f1 int);
 create table t2(f2 int);
 create view v1 as select * from t1, t2;

--- 1.47/mysql-test/t/information_schema.test	2005-07-31 02:49:46 -07:00
+++ 1.48/mysql-test/t/information_schema.test	2005-08-02 16:26:03 -07:00
@@ -411,6 +411,8 @@
 #
 # Bug #7981:SHOW GLOBAL STATUS crashes server
 #
+# We don't actually care about the value, just that it doesn't crash.
+--replace_column 2 #
 show global status like "Threads_running";
 
 #