Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 586e238f01c7cb4eccf064bb5de3347c8c97bd14 https://github.com/phpmyadmin/phpmyadmin/commit/586e238f01c7cb4eccf064bb5de3... Author: Michal Čihař <michal@cihar.com> Date: 2016-04-26 (Tue, 26 Apr 2016) Changed paths: M ChangeLog M libraries/sql-parser/src/Components/Expression.php M libraries/sql-parser/src/Components/JoinKeyword.php M libraries/sql-parser/src/Contexts/ContextMySql50000.php M libraries/sql-parser/src/Contexts/ContextMySql50100.php M libraries/sql-parser/src/Contexts/ContextMySql50500.php M libraries/sql-parser/src/Contexts/ContextMySql50600.php M libraries/sql-parser/src/Contexts/ContextMySql50700.php M libraries/sql-parser/src/Parser.php Log Message: ----------- Update SQL parser to 3.4.4 Revision 1ec169a2a76110bbd0734da23a43c4d23c1eecfb Fixes #12144 Fixes #12205 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 70c144f2005a8cc3d857e5b84cd0c0a42ccb8dd7 https://github.com/phpmyadmin/phpmyadmin/commit/70c144f2005a8cc3d857e5b84cd0... Author: Michal Čihař <michal@cihar.com> Date: 2016-04-26 (Tue, 26 Apr 2016) Changed paths: M ChangeLog Log Message: ----------- Merge branch 'QA_4_6' Commit: b90bb0a462fa1380e3a664b85c766c778f43c730 https://github.com/phpmyadmin/phpmyadmin/commit/b90bb0a462fa1380e3a664b85c76... Author: Michal Čihař <michal@cihar.com> Date: 2016-04-26 (Tue, 26 Apr 2016) Changed paths: M po/fil.po Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0674deeb5bff...b90bb0a462fa