Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 85dd699364521ebdfadd116b2c6970602ae3346a https://github.com/phpmyadmin/phpmyadmin/commit/85dd699364521ebdfadd116b2c69... Author: Dan Ungureanu udan1107@gmail.com Date: 2016-02-12 (Fri, 12 Feb 2016)
Changed paths: M ChangeLog M libraries/sql-parser/src/Components/AlterOperation.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/IntoKeyword.php M libraries/sql-parser/src/Components/JoinKeyword.php M libraries/sql-parser/src/Components/PartitionDefinition.php M libraries/sql-parser/src/Components/Reference.php M libraries/sql-parser/src/Components/RenameOperation.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
Log Message: ----------- Updated sql-parser to phpmyadmin/sql-parser@66b528dc0f3aa81c726bf928c01377ba9b048df0 (v3.3.1). Fixes #11956. unrecognized keyword interval Fixes issues regarding field names and aliases.
Signed-off-by: Dan Ungureanu udan1107@gmail.com
Commit: e21fbe665ddef4467ad74649afb049c7e4943891 https://github.com/phpmyadmin/phpmyadmin/commit/e21fbe665ddef4467ad74649afb0... Author: Dan Ungureanu udan1107@gmail.com Date: 2016-02-12 (Fri, 12 Feb 2016)
Changed paths: M ChangeLog M libraries/sql-parser/src/Components/AlterOperation.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/IntoKeyword.php M libraries/sql-parser/src/Components/JoinKeyword.php M libraries/sql-parser/src/Components/PartitionDefinition.php M libraries/sql-parser/src/Components/Reference.php M libraries/sql-parser/src/Components/RenameOperation.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
Log Message: ----------- Merge branch 'QA_4_5' into QA_4_6
Commit: f980812f5746262e16f3f409523f75d8382a38e7 https://github.com/phpmyadmin/phpmyadmin/commit/f980812f5746262e16f3f409523f... Author: Dan Ungureanu udan1107@gmail.com Date: 2016-02-12 (Fri, 12 Feb 2016)
Changed paths: M ChangeLog M libraries/sql-parser/src/Components/AlterOperation.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/IntoKeyword.php M libraries/sql-parser/src/Components/JoinKeyword.php M libraries/sql-parser/src/Components/PartitionDefinition.php M libraries/sql-parser/src/Components/Reference.php M libraries/sql-parser/src/Components/RenameOperation.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
Log Message: ----------- Merge branch 'QA_4_6'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6d73ee1e4d2e...f980812f5746