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

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


mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/openssl_1.result:
  Manual resolve.
mysql-test/t/openssl_1.test:
  Manual resolve.

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.

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

mysql-test/t/information_schema.test

@@ -1042,16 +1042,13 @@ select user,db from information_schema.processlist;
 connection default;
 drop user user3148@localhost;
 
-
-
 #
-# Bug #26174 Server Crash: INSERT ... SELECT ... FROM I_S.GLOBAL_STATUS in Event
+# Bug #26174 Server Crash: INSERT ... SELECT ... FROM I_S.GLOBAL_STATUS
+# in Event (see also openssl_1.test)
 #
 --disable_warnings
-DROP TABLE IF EXISTS thread_status;
 DROP TABLE IF EXISTS server_status;
 DROP EVENT IF EXISTS event_status;
-
 --enable_warnings
 
 SET GLOBAL event_scheduler=1;
@@ -1063,12 +1060,6 @@ CREATE EVENT event_status
  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
@@ -1079,15 +1070,11 @@ END$$
 DELIMITER ;$$
 
 let $wait_condition=select count(*) = 0 from information_schema.events where event_name='event_status';
-let $wait_timeout=30;
 --source include/wait_condition.inc
 
-SELECT variable_name, variable_value FROM thread_status;
 SELECT variable_name FROM server_status;
 
-DROP TABLE thread_status;
 DROP TABLE server_status;
 SET GLOBAL event_scheduler=0;
 
 --echo End of 5.1 tests.
-

mysql-test/t/openssl_1.test

@@ -104,3 +104,41 @@ drop table t1;
 # and ca path to NULL
 #
 --exec $MYSQL --ssl --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1
+--echo End of 5.0 tests
+
+#
+# Bug #26174 Server Crash: INSERT ... SELECT ... FROM I_S.GLOBAL_STATUS in
+# Event (see also information_schema.test for the other part of test for
+# this bug).
+#
+--disable_warnings
+DROP TABLE IF EXISTS thread_status;
+DROP EVENT IF EXISTS event_status;
+--enable_warnings
+
+SET GLOBAL event_scheduler=1;
+
+DELIMITER $$;
+
+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$$
+
+DELIMITER ;$$
+
+let $wait_condition=select count(*) = 0 from information_schema.events where event_name='event_status';
+--source include/wait_condition.inc
+
+SELECT variable_name, variable_value FROM thread_status;
+
+DROP TABLE thread_status;
+SET GLOBAL event_scheduler=0;
+--echo End of 5.1 tests