Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: aa034bb0c9f3757b919cfc89056380b84e66e1ef https://github.com/phpmyadmin/phpmyadmin/commit/aa034bb0c9f3757b919cfc890563... Author: Michal Čihař <michal@cihar.com> Date: 2016-03-18 (Fri, 18 Mar 2016) Changed paths: M ChangeLog M libraries/sql-parser/src/Components/Condition.php A libraries/sql-parser/src/Utils/CLI.php M libraries/sql-parser/src/Utils/Formatter.php Log Message: ----------- Update SQL parser - issue #12026 Fixed parsing of UNION SELECT with brackets Signed-off-by: Michal Čihař <michal@cihar.com> Commit: aa1278b12dade6695e305f58843f9bca030d334f https://github.com/phpmyadmin/phpmyadmin/commit/aa1278b12dade6695e305f58843f... Author: Michal Čihař <michal@cihar.com> Date: 2016-03-18 (Fri, 18 Mar 2016) Changed paths: M ChangeLog Log Message: ----------- Merge branch 'QA_4_6' Signed-off-by: Michal Čihař <michal@cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8a5bf7277578...aa1278b12dad