Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1824f33650d4da98559e4877eeba3731ff17fb85 https://github.com/phpmyadmin/phpmyadmin/commit/1824f33650d4da98559e4877eeba... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-10-15 (Sat, 15 Oct 2016) Changed paths: M libraries/sql.lib.php Log Message: ----------- Use justBrowsing only if outputting the results from a single table The issue #12533 happens because we use countRecords on the parent table since it is incorrectly set, while actually we should be looking at SQL_CALC_FOUND_ROWS instead. Fix #12533 Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> Commit: 10a2eedeb26b3d65390203d081cbae966b216f4c https://github.com/phpmyadmin/phpmyadmin/commit/10a2eedeb26b3d65390203d081cb... Author: Michal Čihař <michal@cihar.com> Date: 2016-10-18 (Tue, 18 Oct 2016) Changed paths: M libraries/sql.lib.php Log Message: ----------- Merge pull request #12647 from devenbansod/fix_12533 Use justBrowsing only if outputting the results from a single table Commit: 9de117ffed01877d35f8953100437ac3eb9f68a0 https://github.com/phpmyadmin/phpmyadmin/commit/9de117ffed01877d35f895310043... Author: Michal Čihař <michal@cihar.com> Date: 2016-10-18 (Tue, 18 Oct 2016) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #12647 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 11fcf44078a7e11f983cd451e0475a5982420d87 https://github.com/phpmyadmin/phpmyadmin/commit/11fcf44078a7e11f983cd451e047... Author: Michal Čihař <michal@cihar.com> Date: 2016-10-18 (Tue, 18 Oct 2016) Changed paths: M ChangeLog M libraries/sql.lib.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/55c30edf9995...11fcf44078a7