Alexander Nozdrin eacc937d48 Manual merge from mysql-trunk-merge. ... Conflicts: - configure.in - include/m_string.h - mysql-test/extra/rpl_tests/rpl_row_func003.test - mysql-test/r/mysqlbinlog.result - mysql-test/r/union.result - mysql-test/suite/binlog/r/binlog_killed_simulate.result - mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result - mysql-test/suite/binlog/r/binlog_unsafe.result - mysql-test/suite/binlog/t/binlog_unsafe.test - mysql-test/suite/rpl/r/rpl_loaddata_fatal.result - mysql-test/suite/rpl/r/rpl_loaddata_map.result - mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result - mysql-test/suite/rpl/r/rpl_stm_log.result - mysql-test/suite/rpl/t/rpl_optimize.test - mysql-test/t/mysqlbinlog.test - mysql-test/t/union.test - sql/rpl_utility.h - sql/sql_union.cc - strings/Makefile.am		2010-01-19 19:36:14 +03:00
..
r	Manual merge from mysql-trunk-merge.	2010-01-19 19:36:14 +03:00
t	merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge	2010-01-14 16:44:33 +00:00
combinations	BUG#39934 - post-push fixes.	2009-10-19 10:52:14 +02:00
my.cnf	Manual resolving for the following files	2009-12-01 21:07:18 +02:00