Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 02f613714fc4a8efabb3ac53243e828580447a9b https://github.com/phpmyadmin/phpmyadmin/commit/02f613714fc4a8efabb3ac53243e... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2016-01-28 (Thu, 28 Jan 2016)
Changed paths: M ChangeLog
Log Message: ----------- ChangeLog entries for security issues
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
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
Commit: 70e326deb9ded38f7663577a4f278abf179b3ff9 https://github.com/phpmyadmin/phpmyadmin/commit/70e326deb9ded38f7663577a4f27... Author: Dan Ungureanu udan1107@gmail.com Date: 2016-02-24 (Wed, 24 Feb 2016)
Changed paths: M ChangeLog
Log Message: ----------- Added changelog entries.
Signed-off-by: Dan Ungureanu udan1107@gmail.com
Commit: 67c5514e653e22b8c8c95bc3a0620407b594a299 https://github.com/phpmyadmin/phpmyadmin/commit/67c5514e653e22b8c8c95bc3a062... Author: Michal Čihař michal@cihar.com Date: 2016-02-25 (Thu, 25 Feb 2016)
Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php M libraries/plugins/auth/AuthenticationCookie.class.php M libraries/session.inc.php
Log Message: ----------- Merge branch 'MAINT_4_5_4' into MAINT_4_5_4-security
Commit: 9702259f81312536df5c3d6839c1465b508a84b5 https://github.com/phpmyadmin/phpmyadmin/commit/9702259f81312536df5c3d6839c1... Author: Michal Čihař michal@cihar.com Date: 2016-02-25 (Thu, 25 Feb 2016)
Changed paths: M ChangeLog
Log Message: ----------- Merge remote-tracking branch 'security/MAINT_4_5_4-security' into MAINT_4_5_5
Commit: 5fb33a7af41ed0526f81aebd19fce8d784606c13 https://github.com/phpmyadmin/phpmyadmin/commit/5fb33a7af41ed0526f81aebd19fc... Author: Michal Čihař michal@cihar.com Date: 2016-02-25 (Thu, 25 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 commit '2b1a68cc4eb935ef3df5c7401d0d1338df09bc72' into MAINT_4_5_5
Commit: 57607e062b794f0b641c0e14250876905e89a86b https://github.com/phpmyadmin/phpmyadmin/commit/57607e062b794f0b641c0e142508... Author: Michal Čihař michal@cihar.com Date: 2016-02-25 (Thu, 25 Feb 2016)
Changed paths: M ChangeLog
Log Message: ----------- Add changelog for SQL parser update
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 1297747a65c80a60ab777cd1fe905fc8d724d4d5 https://github.com/phpmyadmin/phpmyadmin/commit/1297747a65c80a60ab777cd1fe90... Author: Michal Čihař michal@cihar.com Date: 2016-02-25 (Thu, 25 Feb 2016)
Changed paths: M ChangeLog M libraries/plugins/export/ExportSql.class.php
Log Message: ----------- Fixed incorrect usage of SQL parser context in SQL export
Fixes #12029
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 33f0b947dbf6fdc2a4ef312ed21e165aa5dd84c2 https://github.com/phpmyadmin/phpmyadmin/commit/33f0b947dbf6fdc2a4ef312ed21e... Author: Michal Čihař michal@cihar.com Date: 2016-02-25 (Thu, 25 Feb 2016)
Changed paths: M ChangeLog M libraries/plugins/export/ExportSql.php
Log Message: ----------- Merge branch 'QA_4_5' into QA_4_6
Commit: 0d3cac9e04aa7e663116317ed77be0199daa3580 https://github.com/phpmyadmin/phpmyadmin/commit/0d3cac9e04aa7e663116317ed77b... Author: Michal Čihař michal@cihar.com Date: 2016-02-25 (Thu, 25 Feb 2016)
Changed paths: M ChangeLog M libraries/plugins/export/ExportSql.php
Log Message: ----------- Merge branch 'QA_4_6'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ec38e0526721...0d3cac9e04aa