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

[Horst Hunger]

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

 2737 Horst Hunger	2008-09-11
      Change due to review of bug#36873. Made test independent of presetting.
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-09-11 08:20:11 +0000
+++ b/mysql-test/r/wait_timeout_func.result	2008-09-11 18:24:45 +0000
@@ -5,28 +5,28 @@ connect (test_con1, localhost, root,,);
 SELECT @@session.wait_timeout = @@global.wait_timeout AS 'Expect 1';
 Expect 1
 1
-SET @@session.wait_timeout = 2;
+SET @@session.wait_timeout = <session_value>;
 connect (test_con2, localhost, root,,);
-SET @@session.wait_timeout = 1;
+SET @@session.wait_timeout = <session_value> - 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;
+SET @@global.wait_timeout= <global_value>;
 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';
+SELECT @@session.wait_timeout = <session_value> AS 'Expect 1';
 Expect 1
-1
+0
 connection default;
 SELECT info FROM information_schema.processlist;
 info
 SELECT info FROM information_schema.processlist
-SELECT TIMEDIFF(@start_time,CURTIME()) >= 4;
-TIMEDIFF(@start_time,CURTIME()) >= 4
+SELECT TIMEDIFF(@start_time,CURTIME()) >= <global_value> + <session_value>;;
+TIMEDIFF(@start_time,CURTIME()) >= <global_value> + <session_value>;
 1
 SET @@global.wait_timeout= @start_value;

=== modified file 'mysql-test/t/wait_timeout_func.test'
--- a/mysql-test/t/wait_timeout_func.test	2008-09-11 08:20:11 +0000
+++ b/mysql-test/t/wait_timeout_func.test	2008-09-11 18:24:45 +0000
@@ -25,6 +25,7 @@
 
 SET @start_value= @@global.wait_timeout;
 
+
 --echo '#--------------------FN_DYNVARS_186_01-------------------------#'
 #######################################################################
 # 1. test of scope session
@@ -38,13 +39,18 @@ 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;
+# Find a small value <> @@global.wait_timeout.
+let $session_value =
+`SELECT IF(@@global.wait_timeout <> 2 OR @@global.wait_timeout IS NULL, 2, 3)`;
+--replace_result $session_value <session_value>
+eval SET @@session.wait_timeout = $session_value;
 
 --echo connect (test_con2, localhost, root,,);
 connect (test_con2, localhost, root,,);
 connection test_con2;
 
-SET @@session.wait_timeout = 1;
+--replace_result $session_value <session_value>
+eval SET @@session.wait_timeout = $session_value - 1;
 
 --echo connection default;
 connection default;
@@ -59,7 +65,11 @@ SELECT info FROM information_schema.proc
 # 2. test of scope global
 #######################################################################
 
-SET @@global.wait_timeout = 2;
+# Find a small value <> @@global.wait_timeout.
+let $global_value = $session_value + 1;
+#`SELECT IF(@@global.wait_timeout <> 2 OR @@global.wait_timeout IS NULL, 2, 3)`;
+--replace_result $global_value <global_value>
+eval SET @@global.wait_timeout= $global_value;
 
 # Changing the @@global.wait_timeout has no influence on the
 # @@session.wait_timeout of already established sessions.
@@ -70,7 +80,8 @@ 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';
+--replace_result $session_value <session_value>
+eval SELECT @@session.wait_timeout = $session_value AS 'Expect 1';
 
 --echo connection default;
 connection default;
@@ -78,6 +89,7 @@ let $wait_condition= SELECT COUNT(*) = 1
 --source include/wait_condition.inc
 SELECT info FROM information_schema.processlist;
 
-SELECT TIMEDIFF(@start_time,CURTIME()) >= 4; 
+--replace_result $global_value <global_value> $session_value <session_value>;
+eval SELECT TIMEDIFF(@start_time,CURTIME()) >= $global_value + $session_value; 
 SET @@global.wait_timeout= @start_value;