Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin 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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3a054c82d04b...c0f58c0674b5