Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 715403c0e7568390b2493651617319acb00a497b https://github.com/phpmyadmin/phpmyadmin/commit/715403c0e7568390b24936516173... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-09-06 (Tue, 06 Sep 2016) Changed paths: M import.php M js/functions.js M js/messages.php M libraries/import.lib.php M libraries/sql.lib.php M test/libraries/PMA_sql_test.php Log Message: ----------- Fix #12531 : Properly flag queries as DROP DATABASE Parser recognizes various DROP statements correctly, but the flags set by SQL Parser are incorrectly used. In js/functions.js, removed the Regex-based matching, rather handle it in PHP as we have correct flags available from SQL Parser Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> Commit: 28c981dd31a62b17f10787c3ebaa5159aed67875 https://github.com/phpmyadmin/phpmyadmin/commit/28c981dd31a62b17f10787c3ebaa... Author: Michal Čihař <michal@cihar.com> Date: 2016-09-06 (Tue, 06 Sep 2016) Changed paths: M import.php M js/functions.js M js/messages.php M libraries/import.lib.php M libraries/sql.lib.php M test/libraries/PMA_sql_test.php Log Message: ----------- Merge pull request #12532 from devenbansod/fix_12531 Fix #12531 : Properly flag queries as DROP DATABASE Commit: 9df5aebc22542ce7cc087e0d3e1942f45f45455a https://github.com/phpmyadmin/phpmyadmin/commit/9df5aebc22542ce7cc087e0d3e19... Author: Michal Čihař <michal@cihar.com> Date: 2016-09-06 (Tue, 06 Sep 2016) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #12531 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 3debfa5d1ff45948024e31ab41859a477097a155 https://github.com/phpmyadmin/phpmyadmin/commit/3debfa5d1ff45948024e31ab4185... Author: Michal Čihař <michal@cihar.com> Date: 2016-09-06 (Tue, 06 Sep 2016) Changed paths: M ChangeLog M import.php M js/functions.js M js/messages.php M libraries/import.lib.php M libraries/sql.lib.php M test/libraries/PMA_sql_test.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/92cb95c6d5af...3debfa5d1ff4