[Phpmyadmin-git] [phpmyadmin/phpmyadmin] e8fa9e: bug 4245 fix with minimum changes

[Marc Delisle]

  Branch: refs/heads/QA_4_1
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: e8fa9e533565eb2503586ce7040236a928a50de2
      https://github.com/phpmyadmin/phpmyadmin/commit/e8fa9e533565eb2503586ce7040236a928a50de2
  Author: Sampath Liyanage <plbsam at gmail.com>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M libraries/Util.class.php
    M libraries/sql.lib.php

  Log Message:
  -----------
  bug 4245 fix with minimum changes

Signed-off-by: Sampath Liyanage <plbsam at gmail.com>


  Commit: ea0ad9d41c1726a573d6c0beeba7eec5cfa147c7
      https://github.com/phpmyadmin/phpmyadmin/commit/ea0ad9d41c1726a573d6c0beeba7eec5cfa147c7
  Author: Sampath Liyanage <plbsam at gmail.com>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M test/classes/PMA_Header_test.php
    M test/libraries/PMA_insert_edit_test.php
    M test/libraries/PMA_server_binlog_test.php
    M test/libraries/PMA_server_privileges_test.php

  Log Message:
  -----------
  unit tests updated. Some global variables were set in setup functions of some test files. one testing function with mockobjects was changed from once() to exactly(2) because the bug fix has made that function calls twice

Signed-off-by: Sampath Liyanage <plbsam at gmail.com>


  Commit: c357b1b4aa8508462d7f5e541704deb4f5de5bfc
      https://github.com/phpmyadmin/phpmyadmin/commit/c357b1b4aa8508462d7f5e541704deb4f5de5bfc
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M libraries/Util.class.php
    M libraries/sql.lib.php
    M test/classes/PMA_Header_test.php
    M test/libraries/PMA_insert_edit_test.php
    M test/libraries/PMA_server_binlog_test.php
    M test/libraries/PMA_server_privileges_test.php

  Log Message:
  -----------
  Merge pull request #878 from sampathLiyanage/bugfix4245

Bug fix (#4245) - initial "Browse" query does not match sorting order


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/24cc797e5071...c357b1b4aa85