Merge bk-internal.mysql.com:/home/bk/mysql-5.1

into  vajra.(none):/opt/local/work/mysql-5.1-runtime

2 files changed, 22 insertions, 11 deletions

diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
index 3fd6587baaa..078946b4d81 100644
--- a/mysql-test/r/information_schema.result
+++ b/mysql-test/r/information_schema.result
@@ -1408,7 +1408,6 @@ select user,db from information_schema.processlist;
 user	db
 user3148	test
 drop user user3148@localhost;
-DROP TABLE IF EXISTS thread_status;
 DROP TABLE IF EXISTS server_status;
 DROP EVENT IF EXISTS event_status;
 SET GLOBAL event_scheduler=1;
@@ -1417,26 +1416,16 @@ ON SCHEDULE AT NOW()
 ON COMPLETION NOT PRESERVE
 DO
 BEGIN
-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$$
-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;
 variable_name
 ABORTED_CONNECTS
 BINLOG_CACHE_DISK_USE
-DROP TABLE thread_status;
 DROP TABLE server_status;
 SET GLOBAL event_scheduler=0;
 End of 5.1 tests.
diff --git a/mysql-test/r/openssl_1.result b/mysql-test/r/openssl_1.result
index 92900ac1a83..c6e077b2857 100644
--- a/mysql-test/r/openssl_1.result
+++ b/mysql-test/r/openssl_1.result
@@ -53,3 +53,25 @@ SSL error: Unable to get certificate from ''
 mysqltest: Could not open connection 'default': 2026 SSL connection error
 Variable_name	Value
 Ssl_cipher	DHE-RSA-AES256-SHA
+End of 5.0 tests
+DROP TABLE IF EXISTS thread_status;
+DROP EVENT IF EXISTS event_status;
+SET GLOBAL event_scheduler=1;
+CREATE EVENT event_status
+ON SCHEDULE AT NOW()
+ON COMPLETION NOT PRESERVE
+DO
+BEGIN
+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';
+END$$
+SELECT variable_name, variable_value FROM thread_status;
+variable_name	variable_value
+SSL_ACCEPTS	0.0000000
+SSL_CALLBACK_CACHE_HITS	0.0000000
+DROP TABLE thread_status;
+SET GLOBAL event_scheduler=0;
+End of 5.1 tests