[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 585967: Fix columns selection in case of query fails

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 585967b7e42fb7f4d80f6817c1dbc240cc3417a4
      https://github.com/phpmyadmin/phpmyadmin/commit/585967b7e42fb7f4d80f6817c1dbc240cc3417a4
  Author: Michal Čihař <michal at 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 at cihar.com>


  Commit: b7a87ce156585fbce20709565e34f7e585c6afbd
      https://github.com/phpmyadmin/phpmyadmin/commit/b7a87ce156585fbce20709565e34f7e585c6afbd
  Author: Michal Čihař <michal at 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 at cihar.com>


  Commit: 2c55ecc4504bd446640ca7c1e7b1015a2dda2bbf
      https://github.com/phpmyadmin/phpmyadmin/commit/2c55ecc4504bd446640ca7c1e7b1015a2dda2bbf
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-03-01 (Wed, 01 Mar 2017)

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

  Log Message:
  -----------
  Merge branch 'QA_4_7'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/19aad4150679...2c55ecc4504b