~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:6922 from MySQL InnoDB

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

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

  ------------------------------------------------------------------------
  r6921 | mmakela | 2010-03-31 14:33:04 +0300 (Wed, 31 Mar 2010) | 2 lines
  Changed paths:
     M /branches/5.1/mysql-test/innodb_bug51920.result
     M /branches/5.1/mysql-test/innodb_bug51920.test

  branches/5.1: innodb_bug51920.test: Make the test quicker and more
  deterministic.  Suggested by Vasil Dimov.
  ------------------------------------------------------------------------

Show diffs side-by-side

added added

removed removed

Lines of Context:
20
20
--replace_result $ID ID
21
21
eval SET @thread_id= $ID;
22
22
KILL @thread_id;
23
 
SELECT sleep(2);
24
 
SELECT * FROM DATA_DICTIONARY.PROCESSLIST WHERE ID=@thread_id;
 
23
SELECT COUNT(*)=0 FROM data_dictionary.processlist WHERE ID=@thread_id;
 
24
let $wait_timeout= 30;
 
25
let $wait_condition =
 
26
 SELECT COUNT(*)=0 FROM data_dictionary.processlist WHERE ID=@thread_id; 
 
27
-- source include/wait_condition.inc
25
28
 
26
29
connection con1;
27
30
-- error ER_QUERY_INTERRUPTED,20