11 Feb
2016
11 Feb
'16
1:05 p.m.
Branch: refs/heads/QA_4_6
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: cab738cbed36fab06bdbe8d322d0cd049a33d510
https://github.com/phpmyadmin/phpmyadmin/commit/cab738cbed36fab06bdbe8d322d…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2016-02-11 (Thu, 11 Feb 2016)
Changed paths:
M ChangeLog
M libraries/insert_edit.lib.php
M tbl_replace.php
Log Message:
-----------
Fix #11909 Can't insert row into table that contains generated column
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 3a054c82d04bd279fc244164d04574c70a97ac9b
https://github.com/phpmyadmin/phpmyadmin/commit/3a054c82d04bd279fc244164d04…
Author: Madhura Jayaratne <madhura.cj(a)gmail.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' of github.com:phpmyadmin/phpmyadmin into QA_4_6
Conflicts:
ChangeLog
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5a5406ca993c...3a054c82d04b