From: Date: April 5 2007 6:17pm
Subject: bk commit into 5.1 tree (tsmith:1.2564)
List-Archive: http://lists.mysql.com/commits/23911
Message-Id: <20070405161748.263C5D86BB@siva.hindu.god>

Below is the list of changes that have just been committed into a local
5.1 repository of tsmith. When tsmith 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-04-05 10:17:32-06:00, tsmith@stripped +1 -0
  Merge tsmith@stripped:/home/bk/mysql-5.1-runtime
  into  siva.hindu.god:/home/tsmith/m/bk/maint/51
  MERGE: 1.2550.1.4

  mysql-test/r/information_schema.result@stripped, 2007-04-05 10:17:22-06:00, tsmith@stripped +0 -0
    Auto merged
    MERGE: 1.147.1.3

# 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:	tsmith
# Host:	siva.hindu.god
# Root:	/home/tsmith/m/bk/maint/51/RESYNC

--- 1.149/mysql-test/r/information_schema.result	2007-04-04 03:05:06 -06:00
+++ 1.150/mysql-test/r/information_schema.result	2007-04-05 10:17:22 -06:00
@@ -1409,31 +1409,33 @@ user	db
 user3148	test
 drop user user3148@localhost;
 DROP TABLE IF EXISTS thread_status;
-CREATE TABLE thread_status (variable_name VARCHAR(64),
-variable_value DECIMAL(22,7));
-CREATE TABLE server_status (variable_name VARCHAR(64),
-variable_value DECIMAL(22,7));
-DROP EVENT IF EXISTS log_status;
-CREATE EVENT log_status
+DROP TABLE IF EXISTS server_status;
+DROP EVENT IF EXISTS event_status;
+SET GLOBAL event_scheduler=1;
+CREATE EVENT event_status
 ON SCHEDULE AT NOW()
-ON COMPLETION PRESERVE
+ON COMPLETION NOT PRESERVE
 DO
 BEGIN
-INSERT INTO thread_status SELECT variable_name, variable_value FROM
-information_schema.session_status;
-INSERT INTO server_status SELECT variable_name, variable_value FROM
-information_schema.global_status;
+CREATE TABLE thread_status
+SELECT variable_name, variable_value
+FROM information_schema.session_status
+WHERE variable_name LIKE 'SSL_ACCEPTS' OR
+variable_name LIKE 'SSL_CALLBACK_CACHE_HITS';
+CREATE TABLE server_status
+SELECT variable_name
+FROM information_schema.global_status
+WHERE variable_name LIKE 'ABORTED_CONNECTS' OR
+variable_name LIKE 'BINLOG_CACHE_DISK_USE';
 END$$
-SET GLOBAL event_scheduler=1;
-SELECT * FROM thread_status WHERE variable_name LIKE 'SSL%' LIMIT 1,2;
+SELECT variable_name, variable_value FROM thread_status;
 variable_name	variable_value
 SSL_ACCEPTS	0.0000000
 SSL_CALLBACK_CACHE_HITS	0.0000000
-SELECT variable_name FROM server_status LIMIT 1,2;
+SELECT variable_name FROM server_status;
 variable_name
 ABORTED_CONNECTS
 BINLOG_CACHE_DISK_USE
-DROP EVENT log_status;
 DROP TABLE thread_status;
 DROP TABLE server_status;
 SET GLOBAL event_scheduler=0;