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

into host.loc:/work/bk/5.1-bugteam

Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam
into host.loc:/work/bk/5.1-bugteam
03dfe204 · unknown · b6fdf4d9 · 216ed805 · 03dfe204 · 03dfe204
Commit 03dfe204 authored May 13, 2008 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

mysql-test/r/mix2_myisam.result mysql-test/r/mix2_myisam.result +0 -1

mysql-test/t/disabled.def mysql-test/t/disabled.def +3 -0

No files found.
--- a/mysql-test/r/mix2_myisam.result
+++ b/mysql-test/r/mix2_myisam.result
@@ -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,'*')
 *+ *+*+ *

--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -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