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

Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam 

into  host.loc:/work/bk/5.1-bugteam
parents e6b8470d d558fcbd

mysql-test/r/mix2_myisam.result

+0 −1
Original line number Diff line number Diff line
@@ -1415,7 +1415,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/t/disabled.def

+3 −0
Original line number Diff line number Diff line
@@ -17,3 +17,6 @@ user_limits : Bug#23921 random failure of user_limits.test 
key_buffer_size_basic_64    : Bug #36522: Some tests of system variables have diffs on 64bit platorms

rpl_recovery_rank_basic_64  : Bug #36522: Some tests of system variables have diffs on 64bit platorms

sort_buffer_size_basic_64   : Bug #36522: Some tests of system variables have diffs on 64bit platorms

max_heap_table_size_basic_32 : #36522: Some tests of system variables have diffs on 64bit platorms

query_cache_size_basic_32    : #36522: Some tests of system variables have diffs on 64bit platorms

tmp_table_size_basic_32      : #36522: Some tests of system variables have diffs on 64bit platorms