bk commit into 5.0 tree (cmiller:1.2360)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.0 repository of cmiller. When cmiller 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, 2007-01-18 09:48:41-05:00, cmiller@stripped +2 -0
  Override the post-flush value, as a second could pass between the two
  statements.

  mysql-test/r/information_schema.result@stripped, 2007-01-18 09:48:39-05:00,
cmiller@stripped +2 -2
    Override the post-flush value, as a second could pass between the two
    statements.

  mysql-test/t/information_schema.test@stripped, 2007-01-18 09:48:39-05:00,
cmiller@stripped +2 -1
    Override the post-flush value, as a second could pass between the two
    statements.

# 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:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/mysql-5.0-community--bug24822

--- 1.118/mysql-test/r/information_schema.result	2007-01-18 09:48:45 -05:00
+++ 1.119/mysql-test/r/information_schema.result	2007-01-18 09:48:45 -05:00
@@ -1271,8 +1271,8 @@ id	select_type	table	type	possible_keys	
 drop view v1;
 show global status like "Uptime_%";
 Variable_name	Value
-Uptime_since_flush_status	(sec)
+Uptime_since_flush_status	#
 flush status;
 show global status like "Uptime_%";
 Variable_name	Value
-Uptime_since_flush_status	0
+Uptime_since_flush_status	#

--- 1.89/mysql-test/t/information_schema.test	2007-01-18 09:48:45 -05:00
+++ 1.90/mysql-test/t/information_schema.test	2007-01-18 09:48:45 -05:00
@@ -987,9 +987,10 @@ drop view v1;
 #
 # Bug#24822: Patch: uptime_since_flush_status
 #
---replace_column 2 (sec)
+--replace_column 2 #
 show global status like "Uptime_%";
 flush status;
+--replace_column 2 #
 show global status like "Uptime_%";  # Almost certainly zero