~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/tests/t/innodb_bug51920.test

Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6925 from MySQL InnoDB

Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6925

Also fix wait_condition for drizzle, and queries in the test.

Original Authors: mmakela
Original commit message:
branches/zip: Merge revisions 6921:6924 from branches/5.1:

  ------------------------------------------------------------------------
  r6924 | mmakela | 2010-03-31 15:28:25 +0300 (Wed, 31 Mar 2010) | 1 line
  Changed paths:
     M /branches/5.1/mysql-test/innodb_bug51920.test

  branches/5.1: innodb_bug51920.test: Fix a race condition.
  ------------------------------------------------------------------------

Show diffs side-by-side

added added

removed removed

Lines of Context:
17
17
UPDATE bug51920 SET i=2;
18
18
 
19
19
connection default;
 
20
 
20
21
--replace_result $ID ID
21
22
eval SET @thread_id= $ID;
 
23
 
 
24
let $wait_timeout= 30;
 
25
let $wait_condition =
 
26
  SELECT COUNT(*)=1 FROM data_dictionary.processlist
 
27
  WHERE ID=@thread_id;
 
28
-- source include/wait_condition.inc
 
29
 
22
30
KILL @thread_id;
23
 
SELECT COUNT(*)=0 FROM data_dictionary.processlist WHERE ID=@thread_id;
 
31
 
24
32
let $wait_timeout= 30;
25
33
let $wait_condition =
26
34
 SELECT COUNT(*)=0 FROM data_dictionary.processlist WHERE ID=@thread_id;