Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b3583d4cbaa49198560c37e25e16baa784a01403 https://github.com/phpmyadmin/phpmyadmin/commit/b3583d4cbaa49198560c37e25e16... Author: Ashutosh Dhundhara ashutoshdhundhara@yahoo.com Date: 2014-08-04 (Mon, 04 Aug 2014)

Changed paths: M doc/faq.rst M libraries/relation.lib.php

Log Message: ----------- RFE#1491: Support InnoDB for database Query by example.

Signed-off-by: Ashutosh Dhundhara ashutoshdhundhara@yahoo.com

FAQ entry should remain.

Signed-off-by: Ashutosh Dhundhara ashutoshdhundhara@yahoo.com

Commit: 4bf4c8c33ca12dd26c8bc0353e8a7edfcc1b2ef6 https://github.com/phpmyadmin/phpmyadmin/commit/4bf4c8c33ca12dd26c8bc0353e8a... Author: Marc Delisle marc@infomarc.info Date: 2014-08-05 (Tue, 05 Aug 2014)

Changed paths: M doc/faq.rst M libraries/relation.lib.php

Log Message: ----------- Merge pull request #1314 from ashutoshdhundhara/rfe_1491

RFE#1491: Support InnoDB for database Query by example.

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2aca7d838243...4bf4c8c33ca1