5 Commits

Author	SHA1	Message	Date
Marko Mäkelä	d8bce94ad7	Merge mysql-5.1 to mysql-5.5.	2011-11-10 16:50:34 +02:00
Marko Mäkelä	8c886b3bc0	Bug #12842206 INNODB LOCKING REGRESSION FOR INSERT IGNORE: Add a test case. ... The bug was accidentally fixed by fixing Bug#11759688 52020: InnoDB can still deadlock on just INSERT...ON DUPLICATE KEY a.k.a. the reintroduction of Bug#7975 deadlock without any locking, simple select and update	2011-11-10 16:45:47 +02:00
Vasil Dimov	5fff85e697	Merge mysql-trunk-bugfixing -> mysql-trunk-innodb	2010-05-21 17:52:35 +03:00
Vasil Dimov	eaadb377af	Move InnoDB mysql-tests to the innodb suite.	2010-04-16 19:19:07 +03:00
Vasil Dimov	f5692f21f9	Remove outdated InnoDB Plugin tests from mysql-test/suite/innodb, ... the InnoDB Plugin tests are now in mysql-test/suite/innodb_plugin. Move InnoDB tests to the innodb suite at mysql-test/suite/innodb.	2010-04-12 14:56:24 +03:00