Branch: refs/heads/master 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
Commit: 81b11a31a7182741d4cc46de01f2b00dfc46b7e7 https://github.com/phpmyadmin/phpmyadmin/commit/81b11a31a7182741d4cc46de01f2... Author: Hanson String miss30kr55@gmail.com Date: 2015-12-20 (Sun, 20 Dec 2015)
Changed paths: M po/ko.po
Log Message: ----------- Translated using Weblate (Korean)
Currently translated at 78.1% (2510 of 3210 strings)
[CI skip]
Commit: 3d29a79b72028a6b69cf1ad1b8cbff015d196c29 https://github.com/phpmyadmin/phpmyadmin/commit/3d29a79b72028a6b69cf1ad1b8cb... Author: Weblate noreply@weblate.org 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 remote-tracking branch 'origin/QA_4_5' into QA_4_5
Commit: 703c215b38491a826bfad80d74d75af2d11b9614 https://github.com/phpmyadmin/phpmyadmin/commit/703c215b38491a826bfad80d74d7... 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: ----------- Fix merge conflict
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: c8d908d5107ff6071d3570b867d766cc034d0a3a https://github.com/phpmyadmin/phpmyadmin/commit/c8d908d5107ff6071d3570b867d7... Author: Marc Delisle marc@infomarc.info Date: 2015-12-20 (Sun, 20 Dec 2015)
Log Message: ----------- Merge branch 'QA_4_5'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9b0608474bd1...c8d908d5107f
-
Marc Delisle