After merge fixes

mysql-test/r/innodb.result:
  Update results
mysql-test/r/warnings.result:
  Update results
sql/item.cc:
  Simple optimization
sql/item_func.cc:
  After merge fix
sql/item_sum.cc:
  Fixes for group_concat and rollup (From Ramil)
sql/sql_parse.cc:
  Remove compiler warning
sql/sql_select.cc:
  Fixed problem with rollup

1 files changed, 24 insertions, 24 deletions

diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result
index 6803c3a40ef..fd516996ae8 100644
--- a/mysql-test/r/warnings.result
+++ b/mysql-test/r/warnings.result
@@ -185,44 +185,44 @@ create table t1 (a int);
 insert into t1 (a) values (1), (2), (3), (4), (5), (6), (7), (8), (9), (10);
 update t1 set a='abc';
 Warnings:
-Warning	1265	Data truncated for column 'a' at row 1
-Warning	1265	Data truncated for column 'a' at row 2
-Warning	1265	Data truncated for column 'a' at row 3
-Warning	1265	Data truncated for column 'a' at row 4
-Warning	1265	Data truncated for column 'a' at row 5
-Warning	1265	Data truncated for column 'a' at row 6
-Warning	1265	Data truncated for column 'a' at row 7
-Warning	1265	Data truncated for column 'a' at row 8
-Warning	1265	Data truncated for column 'a' at row 9
-Warning	1265	Data truncated for column 'a' at row 10
+Warning	1264	Out of range value adjusted for column 'a' at row 1
+Warning	1264	Out of range value adjusted for column 'a' at row 2
+Warning	1264	Out of range value adjusted for column 'a' at row 3
+Warning	1264	Out of range value adjusted for column 'a' at row 4
+Warning	1264	Out of range value adjusted for column 'a' at row 5
+Warning	1264	Out of range value adjusted for column 'a' at row 6
+Warning	1264	Out of range value adjusted for column 'a' at row 7
+Warning	1264	Out of range value adjusted for column 'a' at row 8
+Warning	1264	Out of range value adjusted for column 'a' at row 9
+Warning	1264	Out of range value adjusted for column 'a' at row 10
 show warnings limit 2, 1;
 Level	Code	Message
-Warning	1265	Data truncated for column 'a' at row 3
+Warning	1264	Out of range value adjusted for column 'a' at row 3
 show warnings limit 0, 10;
 Level	Code	Message
-Warning	1265	Data truncated for column 'a' at row 1
-Warning	1265	Data truncated for column 'a' at row 2
-Warning	1265	Data truncated for column 'a' at row 3
-Warning	1265	Data truncated for column 'a' at row 4
-Warning	1265	Data truncated for column 'a' at row 5
-Warning	1265	Data truncated for column 'a' at row 6
-Warning	1265	Data truncated for column 'a' at row 7
-Warning	1265	Data truncated for column 'a' at row 8
-Warning	1265	Data truncated for column 'a' at row 9
-Warning	1265	Data truncated for column 'a' at row 10
+Warning	1264	Out of range value adjusted for column 'a' at row 1
+Warning	1264	Out of range value adjusted for column 'a' at row 2
+Warning	1264	Out of range value adjusted for column 'a' at row 3
+Warning	1264	Out of range value adjusted for column 'a' at row 4
+Warning	1264	Out of range value adjusted for column 'a' at row 5
+Warning	1264	Out of range value adjusted for column 'a' at row 6
+Warning	1264	Out of range value adjusted for column 'a' at row 7
+Warning	1264	Out of range value adjusted for column 'a' at row 8
+Warning	1264	Out of range value adjusted for column 'a' at row 9
+Warning	1264	Out of range value adjusted for column 'a' at row 10
 show warnings limit 9, 1;
 Level	Code	Message
-Warning	1265	Data truncated for column 'a' at row 10
+Warning	1264	Out of range value adjusted for column 'a' at row 10
 show warnings limit 10, 1;
 Level	Code	Message
 show warnings limit 9, 2;
 Level	Code	Message
-Warning	1265	Data truncated for column 'a' at row 10
+Warning	1264	Out of range value adjusted for column 'a' at row 10
 show warnings limit 0, 0;
 Level	Code	Message
 show warnings limit 1;
 Level	Code	Message
-Warning	1265	Data truncated for column 'a' at row 1
+Warning	1264	Out of range value adjusted for column 'a' at row 1
 show warnings limit 0;
 Level	Code	Message
 show warnings limit 1, 0;