bzr commit into mysql-5.1 branch (horst:2736) Bug#36873

[Horst Hunger]

#At file:///work/bzr/mysql-5.1-sys-var/

 2736 Horst Hunger	2008-09-11
      Changes made as result of the 1. review for Bug#36873.
removed:
  mysql-test/t/wait_timeout-master.opt
modified:
  mysql-test/r/wait_timeout_func.result
  mysql-test/t/wait_timeout_func.test

=== modified file 'mysql-test/r/wait_timeout_func.result'
--- a/mysql-test/r/wait_timeout_func.result	2008-08-28 14:46:48 +0000
+++ b/mysql-test/r/wait_timeout_func.result	2008-09-11 08:20:11 +0000
@@ -2,15 +2,26 @@ SET @start_value= @@global.wait_timeout;
 '#--------------------FN_DYNVARS_186_01-------------------------#'
 SET @start_time= CURTIME();
 connect (test_con1, localhost, root,,);
+SELECT @@session.wait_timeout = @@global.wait_timeout AS 'Expect 1';
+Expect 1
+1
 SET @@session.wait_timeout = 2;
 connect (test_con2, localhost, root,,);
 SET @@session.wait_timeout = 1;
+connection default;
+wait until connections ready
 SELECT info FROM information_schema.processlist;
 info
 SELECT info FROM information_schema.processlist
 '#--------------------FN_DYNVARS_186_03-------------------------#'
 SET @@global.wait_timeout = 2;
+SELECT @@session.wait_timeout = @start_value AS 'Expect 1';
+Expect 1
+1
 connect (test_con3, localhost, root,,);
+SELECT @@session.wait_timeout = @@global.wait_timeout AS 'Expect 1';
+Expect 1
+1
 connection default;
 SELECT info FROM information_schema.processlist;
 info

=== removed file 'mysql-test/t/wait_timeout-master.opt'
--- a/mysql-test/t/wait_timeout-master.opt	2006-02-16 11:02:38 +0000
+++ b/mysql-test/t/wait_timeout-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---wait-timeout=1

=== modified file 'mysql-test/t/wait_timeout_func.test'
--- a/mysql-test/t/wait_timeout_func.test	2008-08-28 14:46:48 +0000
+++ b/mysql-test/t/wait_timeout_func.test	2008-09-11 08:20:11 +0000
@@ -16,8 +16,8 @@
 # Description: Test Cases of Dynamic System Variable wait_timeout             #
 #              that checks the functionality of this variable                 #
 #                                                                             #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/                          #
-#  server-system-variables.html#option_mysqld_wait_timeouts                   #
+# Reference:                                                                  #
+#  http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html        #
 #                                                                             #
 ###############################################################################
 
@@ -35,6 +35,9 @@ SET @start_time= CURTIME();
 connect (test_con1, localhost, root,,);
 connection test_con1;
 
+# If not explicite changed @@session.wait_timeout equals @@global.wait_timeout.
+SELECT @@session.wait_timeout = @@global.wait_timeout AS 'Expect 1';
+
 SET @@session.wait_timeout = 2;
 
 --echo connect (test_con2, localhost, root,,);
@@ -43,8 +46,11 @@ connection test_con2;
 
 SET @@session.wait_timeout = 1;
 
+--echo connection default;
 connection default;
-let $wait_condition= SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST;
+
+--echo wait until connections ready
+let $wait_condition= SELECT COUNT(*) = 1 FROM information_schema.processlist;
 --source include/wait_condition.inc
 SELECT info FROM information_schema.processlist;
 
@@ -55,13 +61,20 @@ SELECT info FROM information_schema.proc
 
 SET @@global.wait_timeout = 2;
 
+# Changing the @@global.wait_timeout has no influence on the
+# @@session.wait_timeout of already established sessions.
+SELECT @@session.wait_timeout = @start_value AS 'Expect 1';
+
 --echo connect (test_con3, localhost, root,,);
 connect (test_con3, localhost, root,,);
 connection test_con3;
 
+# If not explicite changed @@session.wait_timeout equals @@global.wait_timeout.
+SELECT @@session.wait_timeout = @@global.wait_timeout AS 'Expect 1';
+
 --echo connection default;
 connection default;
-let $wait_condition= SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST;
+let $wait_condition= SELECT COUNT(*) = 1 FROM information_schema.processlist;
 --source include/wait_condition.inc
 SELECT info FROM information_schema.processlist;