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

Merge host.loc:/work/bugs/5.0-bugteam-30059 

into  host.loc:/work/bk/5.1-bugteam
parents 45e796d5 1c45081b

mysql-test/r/heap.result

+0 −1
Original line number Diff line number Diff line
@@ -256,7 +256,6 @@ 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

+0 −1
Original line number Diff line number Diff line
@@ -1836,7 +1836,6 @@ 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

+0 −1
Original line number Diff line number Diff line
@@ -1086,7 +1086,6 @@ 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

+0 −2
Original line number Diff line number Diff line
@@ -933,8 +933,6 @@ 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

+0 −1
Original line number Diff line number Diff line
@@ -125,7 +125,6 @@ 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';