← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/r/innodb_mysql.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_mysql.result
1
1
set global innodb_support_xa=default;
2
2
set session innodb_support_xa=default;
3
3
SET SESSION STORAGE_ENGINE = InnoDB;
 
4
SET @orig_lock_wait_timeout= @@innodb_lock_wait_timeout;
 
5
SET GLOBAL innodb_lock_wait_timeout=2;
4
6
drop table if exists t1,t2,t3,t1m,t1i,t2m,t2i,t4;
5
7
create table t1 (
6
8
c_id int not null default '0',
1349
1351
 
1350
1352
DROP TABLE t2;
1351
1353
DROP TABLE t1;
 
1354
SET innodb_lock_wait_timeout=@orig_lock_wait_timeout ;
1352
1355
End of 5.1 tests