3 commits

Author	SHA1	Message	Date
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
Vasil Dimov	49dc3a7b32	Refactor the innodb_bug38231 mysql-test to conform with the ... newly introduced metadata locks. Previously the behavior was deterministic and if several LOCKs were waiting the first one of them was released by UNLOCK (in chronological order). Now (with MDLs) the behavior is undefined and since we do not know in what order to --reap the connections we simply disconnect them without reaping.	2010-04-19 19:58:12 +03:00
Vasil Dimov	eaadb377af	Move InnoDB mysql-tests to the innodb suite.	2010-04-16 19:19:07 +03:00

Renamed from mysql-test/r/innodb_bug38231.result (Browse further)