Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: e68d11a76ce0228d3d68fe91f07221349b4e1d2e https://github.com/phpmyadmin/phpmyadmin/commit/e68d11a76ce0228d3d68fe91f072... Author: Dan Ungureanu <udan1107@gmail.com> Date: 2015-12-20 (Sun, 20 Dec 2015) Changed paths: M libraries/sql-parser/src/Components/Condition.php M libraries/sql-parser/src/Components/Expression.php M libraries/sql-parser/src/Components/ExpressionArray.php M libraries/sql-parser/src/Components/JoinKeyword.php M libraries/sql-parser/src/Components/SetOperation.php M libraries/sql-parser/src/Components/UnionKeyword.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 M libraries/sql-parser/src/Statement.php M libraries/sql-parser/src/Statements/SelectStatement.php Log Message: ----------- Fixes 11744. Incomplete results of UNION ALL Fixes 11742. MATCH AGAINST keywords not recognized Fixes 11723. syntax verifier is not knowing STRAIGHT_JOIN Fixes 11699. REPLACE() function confused with REPLACE statement Fixes 11690. FLUSH word not recognized by parser Updated sql-parser to udan11/sql-parser@47d03c5dc614939b2df057b984544635ae6217db (v3.0.8). Signed-off-by: Dan Ungureanu <udan1107@gmail.com> Commit: 66d80b4a08b241b8cd1e78a33ef2bc3ed386a78e https://github.com/phpmyadmin/phpmyadmin/commit/66d80b4a08b241b8cd1e78a33ef2... Author: Dan Ungureanu <udan1107@gmail.com> Date: 2015-12-20 (Sun, 20 Dec 2015) Changed paths: M ChangeLog Log Message: ----------- Added ChangeLog entries. Signed-off-by: Dan Ungureanu <udan1107@gmail.com> Commit: 00e11d610b3b6996e20000bdbabe806f9a61989e https://github.com/phpmyadmin/phpmyadmin/commit/00e11d610b3b6996e20000bdbabe... Author: Marc Delisle <marc@infomarc.info> Date: 2015-12-20 (Sun, 20 Dec 2015) Changed paths: M ChangeLog M libraries/sql-parser/src/Components/Condition.php M libraries/sql-parser/src/Components/Expression.php M libraries/sql-parser/src/Components/ExpressionArray.php M libraries/sql-parser/src/Components/JoinKeyword.php M libraries/sql-parser/src/Components/SetOperation.php M libraries/sql-parser/src/Components/UnionKeyword.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 M libraries/sql-parser/src/Statement.php M libraries/sql-parser/src/Statements/SelectStatement.php Log Message: ----------- Merge pull request #11765 from udan11/QA_4_5 Fixed multiple sql-parser bugs Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6fe98b7a0b0c...00e11d610b3b