1 files changed, 8 insertions, 4 deletions
diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test
index 5add6247eaa..b227614e7ae 100644
--- a/mysql-test/t/innodb.test
+++ b/mysql-test/t/innodb.test
@@ -906,7 +906,7 @@ drop table t1;
 # Test of multi-table-updates (bug #1980).
 #
 
-create table t1 ( c char(8) not null ) type=innodb;
+create table t1 ( c char(8) not null ) engine=innodb;
 insert into t1 values ('0'),('1'),('2'),('3'),('4'),('5'),('6'),('7'),('8'),('9');
 insert into t1 values ('A'),('B'),('C'),('D'),('E'),('F');
 
@@ -915,7 +915,7 @@ alter table t1 add a char(8) not null;
 alter table t1 add primary key (a,b,c);
 update t1 set a=c, b=c;
 
-create table t2 (c char(8) not null, b char(8) not null, a char(8) not null, primary key(a,b,c)) type=innodb;
+create table t2 (c char(8) not null, b char(8) not null, a char(8) not null, primary key(a,b,c)) engine=innodb;
 insert into t2 select * from t1;
 
 delete t1,t2 from t2,t1 where t1.a<'B' and t2.b=t1.b;
@@ -926,19 +926,23 @@ drop table t1,t2;
 #
 
 SET AUTOCOMMIT=1;
-create table t1 (a integer auto_increment primary key) type=innodb;
+create table t1 (a integer auto_increment primary key) engine=innodb;
 insert into t1 (a) values (NULL),(NULL);
 truncate table t1;
 insert into t1 (a) values (NULL),(NULL);
 SELECT * from t1;
 drop table t1;
 
+#
+# Test timestamps
+#
 
 CREATE TABLE t1 (col1 int(1))ENGINE=InnoDB;
 CREATE TABLE t2 (col1 int(1),stamp TIMESTAMP,INDEX stamp_idx
 (stamp))ENGINE=InnoDB;
 insert into t1 values (1),(2),(3);
-insert into t2 values (1, 20020204130000),(2, 20020204130000),(4,20020204310000 );
+# Note that timestamp 3 is wrong
+insert into t2 values (1, 20020204130000),(2, 20020204130000),(4,20020204310000 ),(5,20020204230000);
 SELECT col1 FROM t1 UNION SELECT col1 FROM t2 WHERE stamp <
 '20020204120000' GROUP BY col1;
 drop table t1,t2;