mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  host.loc:/work/bk/5.1-bugteam
This commit is contained in:
unknown 2008-05-13 20:18:51 +05:00
commit 03dfe2044b
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/r/mix2_myisam.result
View file

@ -1415,7 +1415,6 @@ set @a=repeat(' ',20);
insert into t1 values (concat('+',@a),concat('+',@a),concat('+',@a)); insert into t1 values (concat('+',@a),concat('+',@a),concat('+',@a));
Warnings: Warnings:
Note 1265 Data truncated for column 'v' at row 1 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; select concat('*',v,'*',c,'*',t,'*') from t1;
concat('*',v,'*',c,'*',t,'*') concat('*',v,'*',c,'*',t,'*')
*+ *+*+ * *+ *+*+ *

3
mysql-test/t/disabled.def
View file

@ -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 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 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 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