diff options
| author | unknown <jimw@mysql.com> | 2005-10-12 13:28:46 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-10-12 13:28:46 -0700 |
| commit | 0c9997fca7dba2272b894e8f6947199e6ead0b8f (patch) | |
| tree | b92eb31c1064d1dc38b937ee51f183a3e98ce6ae /mysql-test | |
| parent | 101d9189bd585887b9a49f099f26d8dc751f576a (diff) | |
| parent | e61dea1b3676844cf78e3cece5d5db1d4a0e847d (diff) | |
| download | mariadb-git-0c9997fca7dba2272b894e8f6947199e6ead0b8f.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-8731b
into mysql.com:/home/jimw/my/mysql-4.1-clean
configure.in:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/wait_timeout.result | 8 | ||||
| -rw-r--r-- | mysql-test/t/wait_timeout-master.opt | 1 | ||||
| -rw-r--r-- | mysql-test/t/wait_timeout.test | 11 |
3 files changed, 20 insertions, 0 deletions
diff --git a/mysql-test/r/wait_timeout.result b/mysql-test/r/wait_timeout.result new file mode 100644 index 00000000000..56232e481c0 --- /dev/null +++ b/mysql-test/r/wait_timeout.result @@ -0,0 +1,8 @@ +select 1; +1 +1 +select 2; +ERROR HY000: MySQL server has gone away +select 3; +3 +3 diff --git a/mysql-test/t/wait_timeout-master.opt b/mysql-test/t/wait_timeout-master.opt new file mode 100644 index 00000000000..0ad622e9677 --- /dev/null +++ b/mysql-test/t/wait_timeout-master.opt @@ -0,0 +1 @@ +--wait-timeout=2 diff --git a/mysql-test/t/wait_timeout.test b/mysql-test/t/wait_timeout.test new file mode 100644 index 00000000000..26f91569868 --- /dev/null +++ b/mysql-test/t/wait_timeout.test @@ -0,0 +1,11 @@ +# +# Bug #8731: wait_timeout does not work on Mac OS X +# +--disable_reconnect +select 1; +# wait_timeout is 2, so we should get disconnected now +--sleep 5 +--error 2006 +select 2; +--enable_reconnect +select 3; |