Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: cab738cbed36fab06bdbe8d322d0cd049a33d510 https://github.com/phpmyadmin/phpmyadmin/commit/cab738cbed36fab06bdbe8d322d0... Author: Madhura Jayaratne <madhura.cj@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@gmail.com> Commit: 3a054c82d04bd279fc244164d04574c70a97ac9b https://github.com/phpmyadmin/phpmyadmin/commit/3a054c82d04bd279fc244164d045... Author: Madhura Jayaratne <madhura.cj@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 Commit: 59342451abae66b969dd7acd9818f678058990d6 https://github.com/phpmyadmin/phpmyadmin/commit/59342451abae66b969dd7acd9818... Author: Madhura Jayaratne <madhura.cj@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@gmail.com> Conflicts: ChangeLog Commit: c0f58c0674b5eaf4398908c261bcad06305c666e https://github.com/phpmyadmin/phpmyadmin/commit/c0f58c0674b5eaf4398908c261bc... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2016-02-11 (Thu, 11 Feb 2016) Log Message: ----------- Merge branch 'QA_4_5' into QA_4_6 Commit: 8aea0eef0a09e86e3aad3fea89caf1a47748e2b4 https://github.com/phpmyadmin/phpmyadmin/commit/8aea0eef0a09e86e3aad3fea89ca... Author: Madhura Jayaratne <madhura.cj@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: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7cea850fd7f6...8aea0eef0a09