← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/include/mix1.inc

merge from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/include/mix1.inc
26
26
#
27
27
 
28
28
eval SET SESSION STORAGE_ENGINE = $engine_type;
 
29
SET @orig_lock_wait_timeout= @@innodb_lock_wait_timeout; 
 
30
SET GLOBAL innodb_lock_wait_timeout=2;
 
31
 
29
32
 
30
33
--disable_warnings
31
34
drop table if exists t1,t2,t3,t1m,t1i,t2m,t2i,t4;
1091
1094
DROP TABLE t2;
1092
1095
DROP TABLE t1;
1093
1096
 
 
1097
SET innodb_lock_wait_timeout=@orig_lock_wait_timeout ;
 
1098
 
1094
1099
--echo End of 5.1 tests