7 Commits

Author	SHA1	Message	Date
Jon Olav Hauglid	1af11051bf	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	6941bfb6bf	Improve the comment in innodb_bug38231.test	2010-05-12 10:44:23 +03:00
Vasil Dimov	8b22035f63	Disable innodb.innodb_bug38231 in embedded mode ... The --send command does not seem to work as expected in that mode.	2010-05-12 10:42:28 +03:00
Vasil Dimov	e54c2e009d	Fix typo in comment in innodb_bug38231.test	2010-04-23 17:12:56 +03:00
Vasil Dimov	4e87ba75b8	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	210510f472	Fix typo in comment.	2010-04-19 14:27:41 +03:00
Vasil Dimov	7670eb5241	Move InnoDB mysql-tests to the innodb suite.	2010-04-16 19:19:07 +03:00