Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 7e12feba5440aca64570d14bae8af76c12b2e542 https://github.com/phpmyadmin/phpmyadmin/commit/7e12feba5440aca64570d14bae8a... Author: Dan Ungureanu <udan1107@gmail.com> Date: 2016-02-10 (Wed, 10 Feb 2016) Changed paths: M libraries/sql-parser/src/Components/ArrayObj.php M libraries/sql-parser/src/Components/Condition.php M libraries/sql-parser/src/Components/CreateDefinition.php M libraries/sql-parser/src/Components/Expression.php M libraries/sql-parser/src/Components/SetOperation.php M libraries/sql-parser/src/Context.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/Statements/AlterStatement.php M libraries/sql-parser/src/Utils/BufferedQuery.php M libraries/sql-parser/src/Utils/Formatter.php Log Message: ----------- Updated sql-parser library to phpmyadmin/sql-parser@38b10f585ac012554f8a3d0dd6e7e3fd255ff94f (v3.1.0). The update includes multiple fixes: - Fixes #11885. Call to undefined function SqlParser\ctype_alnum() - Fixes #11879. 4.5.3.1 - NOW() function not recognized by parser - Fixes #11867. Gracefully handle the DESC statement - Fixes #11843. Fractional timestamp causes corrupted SQL export - Fixes #11836. Static analysis error for valid WHERE condition with IF keyword - Fixes #11800. Syntax Verifier error using REGEXP in SQL statement - Fixes #11799. Backslashes in comments are being interpreted as escape characters Signed-off-by: Dan Ungureanu <udan1107@gmail.com> Commit: 9389db2916c334c3c475dab9fa9f2cd0a76a9a70 https://github.com/phpmyadmin/phpmyadmin/commit/9389db2916c334c3c475dab9fa9f... Author: Dan Ungureanu <udan1107@gmail.com> Date: 2016-02-10 (Wed, 10 Feb 2016) Changed paths: M ChangeLog Log Message: ----------- Added changelog entries for 7e12feba5440aca64570d14bae8af76c12b2e542. Signed-off-by: Dan Ungureanu <udan1107@gmail.com> Commit: 7b80d2cb3d62af0fd68b85dae630d0f01fdfb5ce https://github.com/phpmyadmin/phpmyadmin/commit/7b80d2cb3d62af0fd68b85dae630... Author: Michal Čihař <michal@cihar.com> Date: 2016-02-11 (Thu, 11 Feb 2016) Changed paths: M ChangeLog M libraries/sql-parser/src/Components/ArrayObj.php M libraries/sql-parser/src/Components/Condition.php M libraries/sql-parser/src/Components/CreateDefinition.php M libraries/sql-parser/src/Components/Expression.php M libraries/sql-parser/src/Components/SetOperation.php M libraries/sql-parser/src/Context.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/Statements/AlterStatement.php M libraries/sql-parser/src/Utils/BufferedQuery.php M libraries/sql-parser/src/Utils/Formatter.php Log Message: ----------- Merge pull request #11935 from udan11/QA_4_5 Updated sql-parser Commit: 5a5406ca993c8e4cbb46bb62e2e5f1c82598f3e9 https://github.com/phpmyadmin/phpmyadmin/commit/5a5406ca993c8e4cbb46bb62e2e5... Author: Michal Čihař <michal@cihar.com> Date: 2016-02-11 (Thu, 11 Feb 2016) Changed paths: M ChangeLog M libraries/sql-parser/src/Components/ArrayObj.php M libraries/sql-parser/src/Components/Condition.php M libraries/sql-parser/src/Components/CreateDefinition.php M libraries/sql-parser/src/Components/Expression.php M libraries/sql-parser/src/Components/SetOperation.php M libraries/sql-parser/src/Context.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/Statements/AlterStatement.php M libraries/sql-parser/src/Utils/BufferedQuery.php M libraries/sql-parser/src/Utils/Formatter.php Log Message: ----------- Merge branch 'QA_4_5' into QA_4_6 Commit: 7cea850fd7f6a83a7956ec675dc1f9da7e314d87 https://github.com/phpmyadmin/phpmyadmin/commit/7cea850fd7f6a83a7956ec675dc1... Author: Michal Čihař <michal@cihar.com> Date: 2016-02-11 (Thu, 11 Feb 2016) Changed paths: M ChangeLog M libraries/sql-parser/src/Components/ArrayObj.php M libraries/sql-parser/src/Components/Condition.php M libraries/sql-parser/src/Components/CreateDefinition.php M libraries/sql-parser/src/Components/Expression.php M libraries/sql-parser/src/Components/SetOperation.php M libraries/sql-parser/src/Context.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/Statements/AlterStatement.php M libraries/sql-parser/src/Utils/BufferedQuery.php M libraries/sql-parser/src/Utils/Formatter.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/823489908e3e...7cea850fd7f6