after merge fixes

mysql-test/r/auto_increment.result

@@ -119,7 +119,7 @@ a
 1
 2
 drop table t1;
-create table t1 (a int not null auto_increment primary key) /*!40102 type=heap */;
+create table t1 (a int not null auto_increment primary key) /*!40102 engine=heap */;
 insert into t1 values (NULL);
 insert into t1 values (-1);
 select last_insert_id();
@@ -128,8 +128,8 @@ last_insert_id()
 insert into t1 values (NULL);
 select * from t1;
 a
--1
 1
+-1
 2
 drop table t1;
 create table t1 (i tinyint unsigned not null auto_increment primary key);

mysql-test/r/type_enum.result

@@ -1650,6 +1650,7 @@ select * from t1;
 a
 
 drop table t1;
+set names latin1;
 create table t1 (a enum(0xE4, '1', '2') not null default 0xE4);
 show columns from t1;
 Field	Type	Null	Key	Default	Extra

mysql-test/t/auto_increment.test

@@ -85,7 +85,7 @@ insert into t1 values (NULL);
 select * from t1;
 drop table t1;
 
-create table t1 (a int not null auto_increment primary key) /*!40102 type=heap */;
+create table t1 (a int not null auto_increment primary key) /*!40102 engine=heap */;
 insert into t1 values (NULL);
 insert into t1 values (-1);
 select last_insert_id();

mysql-test/t/type_decimal.test

@@ -248,7 +248,7 @@ CREATE TABLE t1 (a_dec DECIMAL(-1,1));
 #
 #  Zero prepend overflow bug
 #
-
+--disable-warnings
 create table t1(a decimal(7,3));
 insert into t1 values ('1'),('+1'),('-1'),('0000000001'),('+0000000001'),('-0000000001'),('10'),('+10'),('-10'),('0000000010'),('+0000000010'),('-0000000010'),('100'),('+100'),('-100'),('0000000100'),('+0000000100'),('-0000000100'),('1000'),('+1000'),('-1000'),('0000001000'),('+0000001000'),('-0000001000'),('10000'),('+10000'),('-10000'),('0000010000'),('+0000010000'),('-0000010000'),('100000'),('+100000'),('-100000'),('0000100000'),('+0000100000'),('-0000100000'),('1000000'),('+1000000'),('-1000000'),('0001000000'),('+0001000000'),('-0001000000'),('10000000'),('+10000000'),('-10000000'),('0010000000'),('+0010000000'),('-0010000000'),('100000000'),('+100000000'),('-100000000'),('0100000000'),('+0100000000'),('-0100000000'),('1000000000'),('+1000000000'),('-1000000000'),('1000000000'),('+1000000000'),('-1000000000');
 select * from t1;
@@ -259,5 +259,6 @@ select * from t1;
 drop table t1;
 create table t1(a decimal(7,3) zerofill);
 insert into t1 values ('1'),('+1'),('-1'),('0000000001'),('+0000000001'),('-0000000001'),('10'),('+10'),('-10'),('0000000010'),('+0000000010'),('-0000000010'),('100'),('+100'),('-100'),('0000000100'),('+0000000100'),('-0000000100'),('1000'),('+1000'),('-1000'),('0000001000'),('+0000001000'),('-0000001000'),('10000'),('+10000'),('-10000'),('0000010000'),('+0000010000'),('-0000010000'),('100000'),('+100000'),('-100000'),('0000100000'),('+0000100000'),('-0000100000'),('1000000'),('+1000000'),('-1000000'),('0001000000'),('+0001000000'),('-0001000000'),('10000000'),('+10000000'),('-10000000'),('0010000000'),('+0010000000'),('-0010000000'),('100000000'),('+100000000'),('-100000000'),('0100000000'),('+0100000000'),('-0100000000'),('1000000000'),('+1000000000'),('-1000000000'),('1000000000'),('+1000000000'),('-1000000000');
+--enable-warnings
 select * from t1;
 drop table t1;