summaryrefslogtreecommitdiff
path: root/mysql-test/r/wait_timeout.result
diff options
context:
space:
mode:
authorHorst Hunger <horst@mysql.com>2009-01-23 18:19:09 +0100
committerHorst Hunger <horst@mysql.com>2009-01-23 18:19:09 +0100
commitd574142888071b617087fc680151d51b89d5df48 (patch)
treed174ff430ef7f2b4441dec277647e56ea3809b39 /mysql-test/r/wait_timeout.result
parent47bd8d19fd9a6eb8d6a314452db4a916a84adae9 (diff)
downloadmariadb-git-d574142888071b617087fc680151d51b89d5df48.tar.gz
Fix for bug#39108: Set global wait timeout within the test, not more via opt file.
Deleted the opt file. Replaced the sleeps by wait condition. Made some beautyfications. Inserted review results.
Diffstat (limited to 'mysql-test/r/wait_timeout.result')
-rw-r--r--mysql-test/r/wait_timeout.result33
1 files changed, 23 insertions, 10 deletions
diff --git a/mysql-test/r/wait_timeout.result b/mysql-test/r/wait_timeout.result
index 6fbff82f908..adb7d6bafd9 100644
--- a/mysql-test/r/wait_timeout.result
+++ b/mysql-test/r/wait_timeout.result
@@ -1,20 +1,33 @@
-select 0;
-0
-0
-flush status;
-select 1;
+SET @@global.wait_timeout= 2;
+disconnect default;
+connection wait_con;
+connection default;
+--disable_reconnect;
+SELECT 1;
1
1
-select 2;
+connection wait_con;
+connection default;
+SELECT 2;
Got one of the listed errors
-select 3;
+--enable_reconnect;
+SELECT 3;
3
3
-select 1;
+disconnection default;
+connection wait_con;
+connection con1;
+--disable_reconnect;
+SELECT 1;
1
1
-select 2;
+connection wait_con;
+connection con1;
+SELECT 2;
Got one of the listed errors
-select 3;
+--enable_reconnect;
+SELECT 3;
3
3
+SET @@global.wait_timeout= <start_value>;
+disconnection con1;