Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1f439a4dcc133f7f87846f983c980145c16d65ca https://github.com/phpmyadmin/phpmyadmin/commit/1f439a4dcc133f7f87846f983c98... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-11-07 (Mon, 07 Nov 2016)

Changed paths: M libraries/Table.php M libraries/relation.lib.php M test/classes/TableTest.php

Log Message: ----------- Use a work around for testing if numRecords at least N

Fix #12257

Signed-off-by: Deven Bansod devenbansod.bits@gmail.com

Commit: 14ccebbd4b45f5f2962e853e0b185cf807034684 https://github.com/phpmyadmin/phpmyadmin/commit/14ccebbd4b45f5f2962e853e0b18... Author: Michal Čihař michal@cihar.com Date: 2016-11-09 (Wed, 09 Nov 2016)

Changed paths: M libraries/Table.php M libraries/relation.lib.php M test/classes/TableTest.php

Log Message: ----------- Merge remote-tracking branch 'origin/pull/12685' into QA_4_6

Commit: 9b8758512e86b43029afec42683ec1a13052ef00 https://github.com/phpmyadmin/phpmyadmin/commit/9b8758512e86b43029afec42683e... Author: Michal Čihař michal@cihar.com Date: 2016-11-09 (Wed, 09 Nov 2016)

Changed paths: M ChangeLog

Log Message: ----------- Changelog entry for #12685

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 5dc004dfe0644f771520e3714b17f9c08931a4f7 https://github.com/phpmyadmin/phpmyadmin/commit/5dc004dfe0644f771520e3714b17... Author: Michal Čihař michal@cihar.com Date: 2016-11-09 (Wed, 09 Nov 2016)

Changed paths: M ChangeLog M libraries/Table.php M libraries/relation.lib.php M test/classes/TableTest.php

Log Message: ----------- Merge branch 'QA_4_6'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/19db0d1cef1e...5dc004dfe064