Alexander Nozdrin 5676713687 Manual merge from mysql-trunk. ... Conflicts: - client/mysqltest.cc - mysql-test/collections/default.experimental - mysql-test/suite/rpl/t/disabled.def - sql/mysqld.cc - sql/opt_range.cc - sql/sp.cc - sql/sql_acl.cc - sql/sql_partition.cc - sql/sql_table.cc		2009-12-11 12:39:38 +03:00
..
binlog_tests	Manual merge from mysql-trunk-merge.	2009-11-06 17:20:27 +03:00
rpl_tests	Manual merge from mysql-trunk.	2009-12-11 12:39:38 +03:00