merge

mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged

1 files changed, 46 insertions, 45 deletions

diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result
index 0ad165a861a..9d4710ff729 100644
--- a/mysql-test/r/warnings.result
+++ b/mysql-test/r/warnings.result
@@ -2,23 +2,24 @@ drop table if exists t1, t2;
 Warnings:
 Note	1051	Unknown table 't1'
 Note	1051	Unknown table 't2'
+SET SQL_WARNINGS=1;
 create table t1 (a int);
 insert into t1 values (1);
 insert into t1 values ("hej");
 Warnings:
-Warning	1263	Data truncated for column 'a' at row 1
+Warning	1264	Data truncated for column 'a' at row 1
 insert into t1 values ("hej"),("då");
 Warnings:
-Warning	1263	Data truncated for column 'a' at row 1
-Warning	1263	Data truncated for column 'a' at row 2
+Warning	1264	Data truncated for column 'a' at row 1
+Warning	1264	Data truncated for column 'a' at row 2
 set SQL_WARNINGS=1;
 insert into t1 values ("hej");
 Warnings:
-Warning	1263	Data truncated for column 'a' at row 1
+Warning	1264	Data truncated for column 'a' at row 1
 insert into t1 values ("hej"),("då");
 Warnings:
-Warning	1263	Data truncated for column 'a' at row 1
-Warning	1263	Data truncated for column 'a' at row 2
+Warning	1264	Data truncated for column 'a' at row 1
+Warning	1264	Data truncated for column 'a' at row 2
 drop table t1;
 set SQL_WARNINGS=0;
 drop temporary table if exists not_exists;
@@ -45,13 +46,13 @@ drop table t1;
 create table t1(a tinyint, b int not null, c date, d char(5));
 load data infile '../../std_data/warnings_loaddata.dat' into table t1 fields terminated by ',';
 Warnings:
-Warning	1261	Data truncated, NULL supplied to NOT NULL column 'b' at row 2
-Warning	1263	Data truncated for column 'd' at row 3
-Warning	1263	Data truncated for column 'c' at row 4
-Warning	1259	Record count is fewer than the column count at row 5
-Warning	1263	Data truncated for column 'b' at row 6
-Warning	1260	Record count is more than the column count at row 7
-Warning	1262	Data truncated, out of range for column 'a' at row 8
+Warning	1262	Data truncated, NULL supplied to NOT NULL column 'b' at row 2
+Warning	1264	Data truncated for column 'd' at row 3
+Warning	1264	Data truncated for column 'c' at row 4
+Warning	1260	Record count is fewer than the column count at row 5
+Warning	1264	Data truncated for column 'b' at row 6
+Warning	1261	Record count is more than the column count at row 7
+Warning	1263	Data truncated, out of range for column 'a' at row 8
 select @@warning_count;
 @@warning_count
 7
@@ -59,42 +60,42 @@ drop table t1;
 create table t1(a tinyint NOT NULL, b tinyint unsigned, c char(5));
 insert into t1 values(NULL,100,'mysql'),(10,-1,'mysql ab'),(500,256,'open source'),(20,NULL,'test');
 Warnings:
-Warning	1261	Data truncated, NULL supplied to NOT NULL column 'a' at row 1
-Warning	1262	Data truncated, out of range for column 'b' at row 2
-Warning	1263	Data truncated for column 'c' at row 2
-Warning	1262	Data truncated, out of range for column 'a' at row 3
-Warning	1262	Data truncated, out of range for column 'b' at row 3
-Warning	1263	Data truncated for column 'c' at row 3
+Warning	1262	Data truncated, NULL supplied to NOT NULL column 'a' at row 1
+Warning	1263	Data truncated, out of range for column 'b' at row 2
+Warning	1264	Data truncated for column 'c' at row 2
+Warning	1263	Data truncated, out of range for column 'a' at row 3
+Warning	1263	Data truncated, out of range for column 'b' at row 3
+Warning	1264	Data truncated for column 'c' at row 3
 alter table t1 modify c char(4);
 Warnings:
-Warning	1263	Data truncated for column 'c' at row 1
-Warning	1263	Data truncated for column 'c' at row 2
+Warning	1264	Data truncated for column 'c' at row 1
+Warning	1264	Data truncated for column 'c' at row 2
 alter table t1 add d char(2);
 update t1 set a=NULL where a=10;
 Warnings:
-Warning	1261	Data truncated, NULL supplied to NOT NULL column 'a' at row 2
+Warning	1262	Data truncated, NULL supplied to NOT NULL column 'a' at row 2
 update t1 set c='mysql ab' where c='test';
 Warnings:
-Warning	1263	Data truncated for column 'c' at row 4
+Warning	1264	Data truncated for column 'c' at row 4
 update t1 set d=c;
 Warnings:
-Warning	1263	Data truncated for column 'd' at row 1
-Warning	1263	Data truncated for column 'd' at row 2
-Warning	1263	Data truncated for column 'd' at row 3
-Warning	1263	Data truncated for column 'd' at row 4
+Warning	1264	Data truncated for column 'd' at row 1
+Warning	1264	Data truncated for column 'd' at row 2
+Warning	1264	Data truncated for column 'd' at row 3
+Warning	1264	Data truncated for column 'd' at row 4
 create table t2(a tinyint NOT NULL, b char(3));
 insert into t2 select b,c from t1;
 Warnings:
-Warning	1263	Data truncated for column 'b' at row 1
-Warning	1263	Data truncated for column 'b' at row 2
-Warning	1263	Data truncated for column 'b' at row 3
-Warning	1261	Data truncated, NULL supplied to NOT NULL column 'a' at row 4
-Warning	1263	Data truncated for column 'b' at row 4
+Warning	1264	Data truncated for column 'b' at row 1
+Warning	1264	Data truncated for column 'b' at row 2
+Warning	1264	Data truncated for column 'b' at row 3
+Warning	1262	Data truncated, NULL supplied to NOT NULL column 'a' at row 4
+Warning	1264	Data truncated for column 'b' at row 4
 insert into t2(b) values('mysqlab');
 set sql_warnings=1;
 insert into t2(b) values('mysqlab');
 Warnings:
-Warning	1263	Data truncated for column 'b' at row 1
+Warning	1264	Data truncated for column 'b' at row 1
 set sql_warnings=0;
 drop table t1, t2;
 create table t1(a char(10));
@@ -102,24 +103,24 @@ alter table t1 add b char;
 set max_error_count=10;
 update t1 set b=a;
 Warnings:
-Warning	1263	Data truncated for column 'b' at row 1
-Warning	1263	Data truncated for column 'b' at row 2
-Warning	1263	Data truncated for column 'b' at row 3
-Warning	1263	Data truncated for column 'b' at row 4
-Warning	1263	Data truncated for column 'b' at row 5
-Warning	1263	Data truncated for column 'b' at row 6
-Warning	1263	Data truncated for column 'b' at row 7
-Warning	1263	Data truncated for column 'b' at row 8
-Warning	1263	Data truncated for column 'b' at row 9
-Warning	1263	Data truncated for column 'b' at row 10
+Warning	1264	Data truncated for column 'b' at row 1
+Warning	1264	Data truncated for column 'b' at row 2
+Warning	1264	Data truncated for column 'b' at row 3
+Warning	1264	Data truncated for column 'b' at row 4
+Warning	1264	Data truncated for column 'b' at row 5
+Warning	1264	Data truncated for column 'b' at row 6
+Warning	1264	Data truncated for column 'b' at row 7
+Warning	1264	Data truncated for column 'b' at row 8
+Warning	1264	Data truncated for column 'b' at row 9
+Warning	1264	Data truncated for column 'b' at row 10
 select @@warning_count;
 @@warning_count
 50
 drop table t1;
 create table t1 (id int) type=isam;
 Warnings:
-Warning	1264	Using storage engine MYISAM for table 't1'
+Warning	1265	Using storage engine MYISAM for table 't1'
 alter table t1 type=isam;
 Warnings:
-Warning	1264	Using storage engine MYISAM for table 't1'
+Warning	1265	Using storage engine MYISAM for table 't1'
 drop table t1;