Jon Olav Hauglid 142a162c66 manual merge from mysql-trunk-bugfixing ... Conflicts: Text conflict in mysql-test/r/archive.result Contents conflict in mysql-test/r/innodb_bug38231.result Text conflict in mysql-test/r/mdl_sync.result Text conflict in mysql-test/suite/binlog/t/disabled.def Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result Text conflict in mysql-test/t/archive.test Contents conflict in mysql-test/t/innodb_bug38231.test Text conflict in mysql-test/t/mdl_sync.test Text conflict in sql/sp_head.cc Text conflict in sql/sql_show.cc Text conflict in sql/table.cc Text conflict in sql/table.h		2010-06-06 13:19:29 +02:00
..
binlog_tests	manual merge from mysql-trunk-bugfixing	2010-06-06 13:19:29 +02:00
rpl_tests	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.	2010-05-24 00:41:18 +04:00