diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-12-08 17:10:54 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-12-08 17:10:54 +0100 |
| commit | 700a6e59e1d440fdff62fae95668edd73ab29359 (patch) | |
| tree | 4cc80d532d3b9d0ad502e052190fde3e4ee2569d /mysql-test/t/kill.test | |
| parent | e49488ea0238c4b25d055957a3f84b3b441944cb (diff) | |
| parent | 8ba0259a5f5a38eb8f4ca31c9e3edd2ad90fc753 (diff) | |
| download | mariadb-git-700a6e59e1d440fdff62fae95668edd73ab29359.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
mysql-test/t/kill.test:
Auto merged
Diffstat (limited to 'mysql-test/t/kill.test')
| -rw-r--r-- | mysql-test/t/kill.test | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mysql-test/t/kill.test b/mysql-test/t/kill.test index 53a88df7bd9..cf0895f63c4 100644 --- a/mysql-test/t/kill.test +++ b/mysql-test/t/kill.test @@ -76,11 +76,14 @@ insert into t2 select id from t1; create table t3 (kill_id int); insert into t3 values(connection_id()); +connect (conn2, localhost, root,,); +connection conn2; + +connection conn1; -- disable_result_log send select id from t1 where id in (select distinct id from t2); -- enable_result_log -connect (conn2, localhost, root,,); connection conn2; select ((@id := kill_id) - kill_id) from t3; -- sleep 1 |