If VARCHAR strips only trailing spaces, then produce

a note, not a warning or error.

4 files changed, 6 insertions, 6 deletions

diff --git a/mysql-test/r/bdb.result b/mysql-test/r/bdb.result
index e3674486a21..d743bc03675 100644
--- a/mysql-test/r/bdb.result
+++ b/mysql-test/r/bdb.result
@@ -1300,7 +1300,7 @@ insert into t1 values('+ ', '+ ', '+ ');
 set @a=repeat(' ',20);
 insert into t1 values (concat('+',@a),concat('+',@a),concat('+',@a));
 Warnings:
-Warning	1265	Data truncated for column 'v' at row 1
+Note	1265	Data truncated for column 'v' at row 1
 select concat('*',v,'*',c,'*',t,'*') from t1;
 concat('*',v,'*',c,'*',t,'*')
 *+ *+*+ *
@@ -1346,7 +1346,7 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=latin1
 alter table t1 modify t varchar(10);
 Warnings:
-Warning	1265	Data truncated for column 't' at row 2
+Note	1265	Data truncated for column 't' at row 2
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
diff --git a/mysql-test/r/heap.result b/mysql-test/r/heap.result
index 50f6d3d56fc..4d5aabb8b3a 100644
--- a/mysql-test/r/heap.result
+++ b/mysql-test/r/heap.result
@@ -255,7 +255,7 @@ insert into t1 values('+ ', '+ ', '+ ');
 set @a=repeat(' ',20);
 insert into t1 values (concat('+',@a),concat('+',@a),concat('+',@a));
 Warnings:
-Warning	1265	Data truncated for column 'v' at row 1
+Note	1265	Data truncated for column 'v' at row 1
 select concat('*',v,'*',c,'*',t,'*') from t1;
 concat('*',v,'*',c,'*',t,'*')
 *+ *+*+ *
diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result
index 1ac2f9631d7..138cae5cadd 100644
--- a/mysql-test/r/myisam.result
+++ b/mysql-test/r/myisam.result
@@ -571,7 +571,7 @@ insert into t1 values('+ ', '+ ', '+ ');
 set @a=repeat(' ',20);
 insert into t1 values (concat('+',@a),concat('+',@a),concat('+',@a));
 Warnings:
-Warning	1265	Data truncated for column 'v' at row 1
+Note	1265	Data truncated for column 'v' at row 1
 select concat('*',v,'*',c,'*',t,'*') from t1;
 concat('*',v,'*',c,'*',t,'*')
 *+ *+*+ *
@@ -617,7 +617,7 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 alter table t1 modify t varchar(10);
 Warnings:
-Warning	1265	Data truncated for column 't' at row 2
+Note	1265	Data truncated for column 't' at row 2
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
diff --git a/mysql-test/r/strict.result b/mysql-test/r/strict.result
index 4da0f1e48f1..f0f7ed9684e 100644
--- a/mysql-test/r/strict.result
+++ b/mysql-test/r/strict.result
@@ -818,7 +818,6 @@ ERROR 01000: Data truncated for column 'col1' at row 1
 INSERT INTO t1 (col2) VALUES ('hellobob');
 ERROR 01000: Data truncated for column 'col2' at row 1
 INSERT INTO t1 (col2) VALUES ('hello  ');
-ERROR 01000: Data truncated for column 'col2' at row 1
 UPDATE t1 SET col1 ='hellobob' WHERE col1 ='he';
 ERROR 01000: Data truncated for column 'col1' at row 2
 UPDATE t1 SET col2 ='hellobob' WHERE col2 ='he';
@@ -835,6 +834,7 @@ col1	col2
 hello	hello
 he	hellot
 hello	hello 
+NULL	hello 
 hello	hellob
 DROP TABLE t1;
 CREATE TABLE t1 (col1 enum('red','blue','green'));