Branch: refs/heads/QA_4_7 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 585967b7e42fb7f4d80f6817c1dbc240cc3417a4 https://github.com/phpmyadmin/phpmyadmin/commit/585967b7e42fb7f4d80f6817c1db... Author: Michal Čihař michal@cihar.com Date: 2017-03-01 (Wed, 01 Mar 2017)

Changed paths: M libraries/relation.lib.php

Log Message: ----------- Fix columns selection in case of query fails

Signed-off-by: Michal Čihař michal@cihar.com

Commit: b7a87ce156585fbce20709565e34f7e585c6afbd https://github.com/phpmyadmin/phpmyadmin/commit/b7a87ce156585fbce20709565e34... Author: Michal Čihař michal@cihar.com Date: 2017-03-01 (Wed, 01 Mar 2017)

Changed paths: M libraries/dbi/DBIDummy.php M test/libraries/PMA_relation_test.php

Log Message: ----------- Adjust tests to new column selection code

Signed-off-by: Michal Čihař michal@cihar.com

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9d13e3d143ef...b7a87ce15658