Alexey Kopytov 5a59d706be Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. ... Conflicts: Text conflict in mysql-test/r/func_str.result Text conflict in mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_32.result Text conflict in mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_64.result Text conflict in mysql-test/t/func_str.test Text conflict in sql/mysqld.cc Text conflict in sql/protocol.cc Text conflict in storage/myisam/mi_open.c		2010-04-02 19:17:43 +04:00
..
inc	WL#4738 streamline/simplify @@variable creation process	2009-12-22 10:35:56 +01:00
r	Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.	2010-04-02 19:17:43 +04:00
t	Manual merge.	2010-03-19 11:29:12 +03:00