Vasil Dimov e4b19dd475 Adjust innodb_mysql.result after the resolved conflict from the merge		2010-06-17 12:59:53 +03:00
..
include	InnoDB plugin is built-in: remove test code which depended on the plugin property	2009-08-05 12:07:41 +02:00
r	Adjust innodb_mysql.result after the resolved conflict from the merge	2010-06-17 12:59:53 +03:00
t	Merge mysql-trunk-bugfixing -> mysql-trunk-innodb	2010-06-17 12:41:20 +03:00