[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 31d19c: Fix #11520

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 31d19c4cf72ae48df913e5bdbbccae37b244aa3e
      https://github.com/phpmyadmin/phpmyadmin/commit/31d19c4cf72ae48df913e5bdbbccae37b244aa3e
  Author: Deven Bansod <devenbansod.bits at gmail.com>
  Date:   2015-10-11 (Sun, 11 Oct 2015)

  Changed paths:
    M libraries/server_privileges.lib.php
    M test/libraries/PMA_server_privileges_test.php

  Log Message:
  -----------
  Fix #11520

Signed-off-by: Deven Bansod <devenbansod.bits at gmail.com>


  Commit: e9cd6b583c6be168f8f060e4f33e508e6660443d
      https://github.com/phpmyadmin/phpmyadmin/commit/e9cd6b583c6be168f8f060e4f33e508e6660443d
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-10-10 (Sat, 10 Oct 2015)

  Changed paths:
    M libraries/server_privileges.lib.php
    M test/libraries/PMA_server_privileges_test.php

  Log Message:
  -----------
  Merge pull request #11560 from devenbansod/fix_11520

Fix #11520


  Commit: 9eb8dd974def3a434916a32472666fafc28ae523
      https://github.com/phpmyadmin/phpmyadmin/commit/9eb8dd974def3a434916a32472666fafc28ae523
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-10-10 (Sat, 10 Oct 2015)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: fd6ed157a91255bbc4c3c14d58a7cbaa7f6e9409
      https://github.com/phpmyadmin/phpmyadmin/commit/fd6ed157a91255bbc4c3c14d58a7cbaa7f6e9409
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-10-10 (Sat, 10 Oct 2015)

  Changed paths:
    M ChangeLog
    M libraries/server_privileges.lib.php
    M test/libraries/PMA_server_privileges_test.php

  Log Message:
  -----------
  Fix merge conflicts

Signed-off-by: Marc Delisle <marc at infomarc.info>


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/914c12a9c29c...fd6ed157a912