Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2b1a68cc4eb935ef3df5c7401d0d1338df09bc72 https://github.com/phpmyadmin/phpmyadmin/commit/2b1a68cc4eb935ef3df5c7401d0d... Author: Dan Ungureanu udan1107@gmail.com Date: 2016-02-24 (Wed, 24 Feb 2016)
Changed paths: M libraries/sql-parser/src/Components/AlterOperation.php 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/JoinKeyword.php M libraries/sql-parser/src/Components/Key.php M libraries/sql-parser/src/Components/Limit.php M libraries/sql-parser/src/Components/OptionsArray.php M libraries/sql-parser/src/Components/OrderKeyword.php M libraries/sql-parser/src/Components/SetOperation.php M libraries/sql-parser/src/Parser.php M libraries/sql-parser/src/Statements/AlterStatement.php M libraries/sql-parser/src/Statements/CreateStatement.php M libraries/sql-parser/src/Statements/DropStatement.php M libraries/sql-parser/src/Token.php M libraries/sql-parser/src/Utils/Formatter.php M libraries/sql-parser/src/Utils/Query.php
Log Message: ----------- Updates sql-parser to phpmyadmin/sql-parser@5c489d91f561cb0a63e0b63b29d6da71f626a137 (v3.4.0).
Fixes #11971. CREATE UNIQUE INDEX index type is not recognized by parser. Fixes #11982. Row count wrong when grouping joined tables. Fixes #12012. Column definition with default value and comment in CREATE TABLE expoerted faulty. Fixes #12020. New statement but no delimiter and unexpected token with REPLACE.
Signed-off-by: Dan Ungureanu udan1107@gmail.com
Commit: 90605cc9a8cc69dad01b1b46f1cffcbe931f723a https://github.com/phpmyadmin/phpmyadmin/commit/90605cc9a8cc69dad01b1b46f1cf... Author: Dan Ungureanu udan1107@gmail.com Date: 2016-02-24 (Wed, 24 Feb 2016)
Changed paths: M libraries/sql-parser/src/Components/AlterOperation.php 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/JoinKeyword.php M libraries/sql-parser/src/Components/Key.php M libraries/sql-parser/src/Components/Limit.php M libraries/sql-parser/src/Components/OptionsArray.php M libraries/sql-parser/src/Components/OrderKeyword.php M libraries/sql-parser/src/Components/SetOperation.php M libraries/sql-parser/src/Parser.php M libraries/sql-parser/src/Statements/AlterStatement.php M libraries/sql-parser/src/Statements/CreateStatement.php M libraries/sql-parser/src/Statements/DropStatement.php M libraries/sql-parser/src/Token.php M libraries/sql-parser/src/Utils/Formatter.php M libraries/sql-parser/src/Utils/Query.php
Log Message: ----------- Merge branch 'QA_4_5' into QA_4_6
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/968edb64bd69...90605cc9a8cc