Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f4877a782639202770e71771d927129ff8fa2085 https://github.com/phpmyadmin/phpmyadmin/commit/f4877a782639202770e71771d927... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-09-22 (Thu, 22 Sep 2016) Changed paths: M libraries/sql.lib.php Log Message: ----------- Assign LIMIT clause only to syntactically correct queries Assigning LIMIT clause to an syntactically-wrong query is not needed. Also we would want to show the true query and the true error message to the query executor Fix #12321 Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> Commit: b83ba03bd451a43e1b39bb18cc018b1448380f2c https://github.com/phpmyadmin/phpmyadmin/commit/b83ba03bd451a43e1b39bb18cc01... Author: Michal Čihař <michal@cihar.com> Date: 2016-09-22 (Thu, 22 Sep 2016) Changed paths: M libraries/sql.lib.php Log Message: ----------- Merge pull request #12580 from devenbansod/fix_12321 Assign LIMIT clause only to syntactically correct queries Commit: 35011c01709cbad9d42503788c7ad19211894151 https://github.com/phpmyadmin/phpmyadmin/commit/35011c01709cbad9d42503788c7a... Author: Michal Čihař <michal@cihar.com> Date: 2016-09-22 (Thu, 22 Sep 2016) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #12321 and #12580 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: df8a3693bf36441258fb4daad606b3840cdd3dbb https://github.com/phpmyadmin/phpmyadmin/commit/df8a3693bf36441258fb4daad606... Author: Michal Čihař <michal@cihar.com> Date: 2016-09-22 (Thu, 22 Sep 2016) Changed paths: M ChangeLog M libraries/sql.lib.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/fd2215c4698f...df8a3693bf36