← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/r/innodb.result

  • Committer: lbieber
  • Date: 2010-08-25 20:54:20 UTC
  • mfrom: (1730.2.1 staging)
  • Revision ID: lbieber@orisndriz03-20100825205420-nbjf0o6po6b8vc6k
 Merge Patrick - add extra lines to gdbinit on OSX

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/r/innodb.result
 
1
SET @orig_lock_wait_timeout= @@innodb_lock_wait_timeout;
 
2
SET GLOBAL innodb_lock_wait_timeout=2;
1
3
drop table if exists t1,t2,t3,t4;
2
4
drop database if exists mysqltest;
3
5
create table t1 (id int not null auto_increment, code int not null, name char(20) not null, primary key (id), key (code), unique (name)) engine=innodb;
2716
2718
-10
2717
2719
1
2718
2720
DROP TABLE t1;
 
2721
SET GLOBAL innodb_lock_wait_timeout=@orig_lock_wait_timeout ;