Manual merge from mysql-trunk-merge.
Conflicts: - mysql-test/extra/rpl_tests/rpl_mixing_engines.inc - sql/log.cc - sql/mysqld.cc - sql/set_var.cc - sql/sql_class.h
Showing
Please register or sign in to comment
Conflicts: - mysql-test/extra/rpl_tests/rpl_mixing_engines.inc - sql/log.cc - sql/mysqld.cc - sql/set_var.cc - sql/sql_class.h