← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Brian Aker
  • Date: 2010-10-15 00:59:36 UTC
  • mfrom: (1849 staging)
  • mto: This revision was merged to the branch mainline in revision 1853.
  • Revision ID: brian@tangent.org-20101015005936-znhvkz8khs4fhlyv
Merge with trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/tests/t/innodb.test
11
11
#                                                                     #
12
12
#######################################################################
13
13
 
 
14
-- source include/have_innodb.inc
14
15
SET @orig_lock_wait_timeout= @@innodb_lock_wait_timeout; 
15
16
SET GLOBAL innodb_lock_wait_timeout=2;
16
17
 
304
305
select * from t1;
305
306
update t1 set col2='7' where col1='4';
306
307
select * from t1;
307
 
ALTER TABLE t1 ADD co3 INT DEFAULT 42 NOT NULL;
 
308
alter table t1 add co3 int not null;
308
309
select * from t1;
309
310
update t1 set col2='9' where col1='2';
310
311
select * from t1;