[phpMyAdmin Git] [phpmyadmin/phpmyadmin] c60f97: Avoiud displaying query without message

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: c60f97331ac1720ee5df9d68f6fe8da67f061c8a
      https://github.com/phpmyadmin/phpmyadmin/commit/c60f97331ac1720ee5df9d68f6fe8da67f061c8a
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M import.php

  Log Message:
  -----------
  Avoiud displaying query without message

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 4de7b648d2104b398f27aaf48db21ff0f3cc8a2d
      https://github.com/phpmyadmin/phpmyadmin/commit/4de7b648d2104b398f27aaf48db21ff0f3cc8a2d
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M import.php

  Log Message:
  -----------
  Merge branch 'QA_4_6'


  Commit: 35dae125747fdbf8ceb2cbaf23b922d1605df927
      https://github.com/phpmyadmin/phpmyadmin/commit/35dae125747fdbf8ceb2cbaf23b922d1605df927
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M test/bootstrap-dist.php

  Log Message:
  -----------
  Define cell_align_left for tests

It's defined early in common.inc.php so it's always available.

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: b3a2b74aa47b0b957d87b20fc76f75f4c9b3a5b4
      https://github.com/phpmyadmin/phpmyadmin/commit/b3a2b74aa47b0b957d87b20fc76f75f4c9b3a5b4
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M test/bootstrap-dist.php

  Log Message:
  -----------
  Merge branch 'QA_4_6'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/131af0b58cec...b3a2b74aa47b