Commit 8715855a authored by gshchepa/uchum@host.loc's avatar gshchepa/uchum@host.loc
Browse files

Fixed bug#30059. 

Server handles truncation for assignment of too-long values
into CHAR/VARCHAR/TEXT columns in a different ways when the
truncated characters are spaces:
1. CHAR(N) columns silently ignore end-space truncation;
2. TEXT columns post a truncation warning/error in the
   non-strict/strict mode.
3. VARCHAR columns always post a truncation note in
   any mode.

Space truncation processing has been synchronised over
CHAR/VARCHAR/TEXT columns: current behavior of VARCHAR
columns has been propagated as standard.

Binary-encoded string/BLOB columns are not affected.
parent e80794b3

mysql-test/r/heap.result

+1 −0
Original line number Diff line number Diff line
@@ -256,6 +256,7 @@ set @a=repeat(' ',20); 
insert into t1 values (concat('+',@a),concat('+',@a),concat('+',@a));

Warnings:

Note	1265	Data truncated for column 'v' at row 1

Note	1265	Data truncated for column 'c' at row 1

select concat('*',v,'*',c,'*',t,'*') from t1;

concat('*',v,'*',c,'*',t,'*')

*+ *+*+ *

mysql-test/r/innodb.result

+1 −0
Original line number Diff line number Diff line
@@ -1901,6 +1901,7 @@ set @a=repeat(' ',20); 
insert into t1 values (concat('+',@a),concat('+',@a),concat('+',@a));

Warnings:

Note	1265	Data truncated for column 'v' at row 1

Note	1265	Data truncated for column 'c' at row 1

select concat('*',v,'*',c,'*',t,'*') from t1;

concat('*',v,'*',c,'*',t,'*')

*+ *+*+ *

mysql-test/r/myisam.result

+1 −0
Original line number Diff line number Diff line
@@ -1104,6 +1104,7 @@ set @a=repeat(' ',20); 
insert into t1 values (concat('+',@a),concat('+',@a),concat('+',@a));

Warnings:

Note	1265	Data truncated for column 'v' at row 1

Note	1265	Data truncated for column 'c' at row 1

select concat('*',v,'*',c,'*',t,'*') from t1;

concat('*',v,'*',c,'*',t,'*')

*+ *+*+ *

mysql-test/r/strict.result

+2 −0
Original line number Diff line number Diff line
@@ -934,6 +934,8 @@ NULL NULL 
DROP TABLE t1;

CREATE TABLE t1 (col1 CHAR(5), col2 VARCHAR(6));

INSERT INTO t1 VALUES ('hello', 'hello'),('he', 'he'),('hello   ', 'hello ');

Warnings:

Note	1265	Data truncated for column 'col1' at row 3

INSERT INTO t1 (col1) VALUES ('hellobob');

ERROR 22001: Data too long for column 'col1' at row 1

INSERT INTO t1 (col2) VALUES ('hellobob');

mysql-test/r/type_binary.result

+1 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ create table t1 (c char(2), vc varchar(2)); 
insert into t1 values(0x4120, 0x4120);

insert into t1 values(0x412020, 0x412020);

Warnings:

Note	1265	Data truncated for column 'c' at row 1

Note	1265	Data truncated for column 'vc' at row 1

drop table t1;

set @old_sql_mode= @@sql_mode, sql_mode= 'traditional';