Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ed912090ec3f7840f6f9c0b20ed22af56d9f9bc1 https://github.com/phpmyadmin/phpmyadmin/commit/ed912090ec3f7840f6f9c0b20ed2... Author: Michal Čihař <michal@cihar.com> Date: 2017-09-04 (Mon, 04 Sep 2017) Changed paths: M ChangeLog M libraries/Table.php M libraries/controllers/table/TableRelationController.php M libraries/pmd_common.php Log Message: ----------- Fixed saving column to display - avoid consulting current value as that can be automatically guessed - use REPLACE query to avoid need of figuring out query type Fixes #13533 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 71370f1be336b09eac1bfd6e64d52315a0630bb3 https://github.com/phpmyadmin/phpmyadmin/commit/71370f1be336b09eac1bfd6e64d5... Author: Michal Čihař <michal@cihar.com> Date: 2017-09-04 (Mon, 04 Sep 2017) Changed paths: M libraries/controllers/table/TableRelationController.php M tbl_relation.php Log Message: ----------- Remove no longer needed attribute Issue #13533 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: b8be1fecd526c884ad7d7b23b243feae509c91f2 https://github.com/phpmyadmin/phpmyadmin/commit/b8be1fecd526c884ad7d7b23b243... Author: Michal Čihař <michal@cihar.com> Date: 2017-09-04 (Mon, 04 Sep 2017) Changed paths: M ChangeLog M libraries/classes/Controllers/Table/TableRelationController.php M libraries/classes/Table.php M libraries/pmd_common.php M tbl_relation.php Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b7b4c413250b...b8be1fecd526