diff options
| author | unknown <jimw@mysql.com> | 2005-04-04 18:26:39 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-04-04 18:26:39 -0700 |
| commit | fe02ce98aff518eb31f9b69764b42c91fd79b57d (patch) | |
| tree | ecbb322a2b8879e277f89812056ec140c0984690 /mysql-test | |
| parent | a1112ca0563313c8274c9dc2eda6f734ea06da1a (diff) | |
| parent | 92db4a838f9198ab0924b8b876b5991bfe00e8d9 (diff) | |
| download | mariadb-git-fe02ce98aff518eb31f9b69764b42c91fd79b57d.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-8866
into mysql.com:/home/jimw/my/mysql-4.1-clean
client/mysqltest.c:
Auto merged
sql-common/client.c:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/kill.result | 8 | ||||
| -rw-r--r-- | mysql-test/t/kill.test | 13 |
2 files changed, 16 insertions, 5 deletions
diff --git a/mysql-test/r/kill.result b/mysql-test/r/kill.result index 788fab8d31a..dcf17e4bf52 100644 --- a/mysql-test/r/kill.result +++ b/mysql-test/r/kill.result @@ -5,6 +5,14 @@ select ((@id := kill_id) - kill_id) from t1; ((@id := kill_id) - kill_id) 0 kill @id; +select 1; +ERROR HY000: MySQL server has gone away +select ((@id := kill_id) - kill_id) from t1; +((@id := kill_id) - kill_id) +0 +select @id != connection_id(); +@id != connection_id() +1 select 4; 4 4 diff --git a/mysql-test/t/kill.test b/mysql-test/t/kill.test index 65d4f27059f..4afb60a7bdd 100644 --- a/mysql-test/t/kill.test +++ b/mysql-test/t/kill.test @@ -23,12 +23,15 @@ connection con2; select ((@id := kill_id) - kill_id) from t1; kill @id; -# Wait for thread to do. ---sleep 5 -# verify that con1 is doning a reconnect connection con1; -ping -ping + +--disable_reconnect +# this statement should fail +--error 2006 +select 1; +--enable_reconnect +# this should work, and we should have a new connection_id() +select ((@id := kill_id) - kill_id) from t1; select @id != connection_id(); #make sure the server is still alive |