database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge damien-katzs-computer.local:/Users/dkatz/50_kill

Browse Source 
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
This commit is contained in:
unknown
2007-06-21 22:08:14 -04:00
parent 772d158ee2 37344c68f5
commit 58b065ee42
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/t/kill.test
View File

@ -81,7 +81,9 @@ connection conn2;
connection conn1;
-- disable_result_log
send select id from t1 where id in (select distinct id from t2);
# This is a very long running query. If this test start failing, it may
# be necessary to change to an even longer query.
send 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);
-- enable_result_log
connection conn2;