after merge fixes

3 files changed, 126 insertions, 2 deletions

diff --git a/mysql-test/r/auto_increment.result b/mysql-test/r/auto_increment.result
index df14fc74f05..7a7faf0db9a 100644
--- a/mysql-test/r/auto_increment.result
+++ b/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);
diff --git a/mysql-test/r/type_decimal.result b/mysql-test/r/type_decimal.result
index fa4cd231129..97d81d77722 100644
--- a/mysql-test/r/type_decimal.result
+++ b/mysql-test/r/type_decimal.result
@@ -446,6 +446,39 @@ CREATE TABLE t1 (a_dec DECIMAL(-1,1));
 ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near '-1,1))' at line 1
 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');
+Warnings:
+Warning	1263	Data truncated, out of range for column 'a' at row 27
+Warning	1263	Data truncated, out of range for column 'a' at row 30
+Warning	1263	Data truncated, out of range for column 'a' at row 31
+Warning	1263	Data truncated, out of range for column 'a' at row 32
+Warning	1263	Data truncated, out of range for column 'a' at row 33
+Warning	1263	Data truncated, out of range for column 'a' at row 34
+Warning	1263	Data truncated, out of range for column 'a' at row 35
+Warning	1263	Data truncated, out of range for column 'a' at row 36
+Warning	1263	Data truncated, out of range for column 'a' at row 37
+Warning	1263	Data truncated, out of range for column 'a' at row 38
+Warning	1263	Data truncated, out of range for column 'a' at row 39
+Warning	1263	Data truncated, out of range for column 'a' at row 40
+Warning	1263	Data truncated, out of range for column 'a' at row 41
+Warning	1263	Data truncated, out of range for column 'a' at row 42
+Warning	1263	Data truncated, out of range for column 'a' at row 43
+Warning	1263	Data truncated, out of range for column 'a' at row 44
+Warning	1263	Data truncated, out of range for column 'a' at row 45
+Warning	1263	Data truncated, out of range for column 'a' at row 46
+Warning	1263	Data truncated, out of range for column 'a' at row 47
+Warning	1263	Data truncated, out of range for column 'a' at row 48
+Warning	1263	Data truncated, out of range for column 'a' at row 49
+Warning	1263	Data truncated, out of range for column 'a' at row 50
+Warning	1263	Data truncated, out of range for column 'a' at row 51
+Warning	1263	Data truncated, out of range for column 'a' at row 52
+Warning	1263	Data truncated, out of range for column 'a' at row 53
+Warning	1263	Data truncated, out of range for column 'a' at row 54
+Warning	1263	Data truncated, out of range for column 'a' at row 55
+Warning	1263	Data truncated, out of range for column 'a' at row 56
+Warning	1263	Data truncated, out of range for column 'a' at row 57
+Warning	1263	Data truncated, out of range for column 'a' at row 58
+Warning	1263	Data truncated, out of range for column 'a' at row 59
+Warning	1263	Data truncated, out of range for column 'a' at row 60
 select * from t1;
 a
 1.000
@@ -511,6 +544,51 @@ a
 drop table t1;
 create table t1(a decimal(7,3) unsigned);
 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');
+Warnings:
+Warning	1263	Data truncated, out of range for column 'a' at row 3
+Warning	1263	Data truncated, out of range for column 'a' at row 6
+Warning	1263	Data truncated, out of range for column 'a' at row 9
+Warning	1263	Data truncated, out of range for column 'a' at row 12
+Warning	1263	Data truncated, out of range for column 'a' at row 15
+Warning	1263	Data truncated, out of range for column 'a' at row 18
+Warning	1263	Data truncated, out of range for column 'a' at row 21
+Warning	1263	Data truncated, out of range for column 'a' at row 24
+Warning	1263	Data truncated, out of range for column 'a' at row 25
+Warning	1263	Data truncated, out of range for column 'a' at row 26
+Warning	1263	Data truncated, out of range for column 'a' at row 27
+Warning	1263	Data truncated, out of range for column 'a' at row 28
+Warning	1263	Data truncated, out of range for column 'a' at row 29
+Warning	1263	Data truncated, out of range for column 'a' at row 30
+Warning	1263	Data truncated, out of range for column 'a' at row 31
+Warning	1263	Data truncated, out of range for column 'a' at row 32
+Warning	1263	Data truncated, out of range for column 'a' at row 33
+Warning	1263	Data truncated, out of range for column 'a' at row 34
+Warning	1263	Data truncated, out of range for column 'a' at row 35
+Warning	1263	Data truncated, out of range for column 'a' at row 36
+Warning	1263	Data truncated, out of range for column 'a' at row 37
+Warning	1263	Data truncated, out of range for column 'a' at row 38
+Warning	1263	Data truncated, out of range for column 'a' at row 39
+Warning	1263	Data truncated, out of range for column 'a' at row 40
+Warning	1263	Data truncated, out of range for column 'a' at row 41
+Warning	1263	Data truncated, out of range for column 'a' at row 42
+Warning	1263	Data truncated, out of range for column 'a' at row 43
+Warning	1263	Data truncated, out of range for column 'a' at row 44
+Warning	1263	Data truncated, out of range for column 'a' at row 45
+Warning	1263	Data truncated, out of range for column 'a' at row 46
+Warning	1263	Data truncated, out of range for column 'a' at row 47
+Warning	1263	Data truncated, out of range for column 'a' at row 48
+Warning	1263	Data truncated, out of range for column 'a' at row 49
+Warning	1263	Data truncated, out of range for column 'a' at row 50
+Warning	1263	Data truncated, out of range for column 'a' at row 51
+Warning	1263	Data truncated, out of range for column 'a' at row 52
+Warning	1263	Data truncated, out of range for column 'a' at row 53
+Warning	1263	Data truncated, out of range for column 'a' at row 54
+Warning	1263	Data truncated, out of range for column 'a' at row 55
+Warning	1263	Data truncated, out of range for column 'a' at row 56
+Warning	1263	Data truncated, out of range for column 'a' at row 57
+Warning	1263	Data truncated, out of range for column 'a' at row 58
+Warning	1263	Data truncated, out of range for column 'a' at row 59
+Warning	1263	Data truncated, out of range for column 'a' at row 60
 select * from t1;
 a
 1.000
@@ -576,6 +654,51 @@ a
 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');
+Warnings:
+Warning	1263	Data truncated, out of range for column 'a' at row 3
+Warning	1263	Data truncated, out of range for column 'a' at row 6
+Warning	1263	Data truncated, out of range for column 'a' at row 9
+Warning	1263	Data truncated, out of range for column 'a' at row 12
+Warning	1263	Data truncated, out of range for column 'a' at row 15
+Warning	1263	Data truncated, out of range for column 'a' at row 18
+Warning	1263	Data truncated, out of range for column 'a' at row 21
+Warning	1263	Data truncated, out of range for column 'a' at row 24
+Warning	1263	Data truncated, out of range for column 'a' at row 25
+Warning	1263	Data truncated, out of range for column 'a' at row 26
+Warning	1263	Data truncated, out of range for column 'a' at row 27
+Warning	1263	Data truncated, out of range for column 'a' at row 28
+Warning	1263	Data truncated, out of range for column 'a' at row 29
+Warning	1263	Data truncated, out of range for column 'a' at row 30
+Warning	1263	Data truncated, out of range for column 'a' at row 31
+Warning	1263	Data truncated, out of range for column 'a' at row 32
+Warning	1263	Data truncated, out of range for column 'a' at row 33
+Warning	1263	Data truncated, out of range for column 'a' at row 34
+Warning	1263	Data truncated, out of range for column 'a' at row 35
+Warning	1263	Data truncated, out of range for column 'a' at row 36
+Warning	1263	Data truncated, out of range for column 'a' at row 37
+Warning	1263	Data truncated, out of range for column 'a' at row 38
+Warning	1263	Data truncated, out of range for column 'a' at row 39
+Warning	1263	Data truncated, out of range for column 'a' at row 40
+Warning	1263	Data truncated, out of range for column 'a' at row 41
+Warning	1263	Data truncated, out of range for column 'a' at row 42
+Warning	1263	Data truncated, out of range for column 'a' at row 43
+Warning	1263	Data truncated, out of range for column 'a' at row 44
+Warning	1263	Data truncated, out of range for column 'a' at row 45
+Warning	1263	Data truncated, out of range for column 'a' at row 46
+Warning	1263	Data truncated, out of range for column 'a' at row 47
+Warning	1263	Data truncated, out of range for column 'a' at row 48
+Warning	1263	Data truncated, out of range for column 'a' at row 49
+Warning	1263	Data truncated, out of range for column 'a' at row 50
+Warning	1263	Data truncated, out of range for column 'a' at row 51
+Warning	1263	Data truncated, out of range for column 'a' at row 52
+Warning	1263	Data truncated, out of range for column 'a' at row 53
+Warning	1263	Data truncated, out of range for column 'a' at row 54
+Warning	1263	Data truncated, out of range for column 'a' at row 55
+Warning	1263	Data truncated, out of range for column 'a' at row 56
+Warning	1263	Data truncated, out of range for column 'a' at row 57
+Warning	1263	Data truncated, out of range for column 'a' at row 58
+Warning	1263	Data truncated, out of range for column 'a' at row 59
+Warning	1263	Data truncated, out of range for column 'a' at row 60
 select * from t1;
 a
 0001.000
diff --git a/mysql-test/r/type_enum.result b/mysql-test/r/type_enum.result
index db14a658bd2..fe8f78453b7 100644
--- a/mysql-test/r/type_enum.result
+++ b/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