diff options
author | unknown <dkatz@damien-katzs-computer.local> | 2007-06-21 22:08:14 -0400 |
---|---|---|
committer | unknown <dkatz@damien-katzs-computer.local> | 2007-06-21 22:08:14 -0400 |
commit | 58b065ee42f6c7fa0d2bb95f7409d73b1f194d0f (patch) | |
tree | 3c21f223922f6b386abbb95fe8920c2b9ff61632 /mysql-test/r/kill.result | |
parent | 772d158ee29956821b4a145bfa89fa08bca6978b (diff) | |
parent | 37344c68f5c006c582b3f9793d7eb15102a5e807 (diff) | |
download | mariadb-git-58b065ee42f6c7fa0d2bb95f7409d73b1f194d0f.tar.gz |
Merge damien-katzs-computer.local:/Users/dkatz/50_kill
into damien-katzs-computer.local:/Users/dkatz/mysql51
mysql-test/r/kill.result:
Auto merged
mysql-test/t/kill.test:
Auto merged
storage/myisam/sort.c:
Auto merged
Diffstat (limited to 'mysql-test/r/kill.result')
-rw-r--r-- | mysql-test/r/kill.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/kill.result b/mysql-test/r/kill.result index 0d5cd171d2d..a08be429a83 100644 --- a/mysql-test/r/kill.result +++ b/mysql-test/r/kill.result @@ -22,7 +22,7 @@ create table t2 (id int unsigned not null); insert into t2 select id from t1; create table t3 (kill_id int); insert into t3 values(connection_id()); -select id from t1 where id in (select distinct id from t2); +select id from t1 where id in (select distinct a.id from t2 a, t2 b, t2 c, t2 d group by a.id, b.id, c.id, d.id having a.id between 10 and 20); select ((@id := kill_id) - kill_id) from t3; ((@id := kill_id) - kill_id) 0 |