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
std_data	Bug#47323 : mysqlbinlog --verbose displays bad output when events contain subset of columns	2009-10-09 16:54:48 +08:00
t	Manual merge from mysql-trunk-merge.	2010-01-19 19:36:14 +03:00
combinations	WL#4350 Options in my.cnf style config file should not start with --	2008-09-05 15:31:09 +02:00