[phpMyAdmin Git] [phpmyadmin/phpmyadmin] ffe68c: Honor user configured connection collation

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: ffe68c7219eac49ebc7066c732a42c27652a9998
      https://github.com/phpmyadmin/phpmyadmin/commit/ffe68c7219eac49ebc7066c732a42c27652a9998
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-12-19 (Mon, 19 Dec 2016)

  Changed paths:
    M ChangeLog
    M doc/config.rst
    M libraries/DatabaseInterface.php
    M libraries/config.default.php

  Log Message:
  -----------
  Honor user configured connection collation

* the user set collation is now honored
* default value has been changed to utf8mb4
* it is downgraded to utf8 if server does not support it

Fixes #12826

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


  Commit: a856a61c9d62094570ee612efb6aaf475ead62d2
      https://github.com/phpmyadmin/phpmyadmin/commit/a856a61c9d62094570ee612efb6aaf475ead62d2
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-12-19 (Mon, 19 Dec 2016)

  Changed paths:
    M test/classes/plugin/auth/AuthenticationHttpTest.php

  Log Message:
  -----------
  Fix HTTP auth test expectations

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


  Commit: 6bf4f3bf39ee7206b1201114eec012e682d3d37f
      https://github.com/phpmyadmin/phpmyadmin/commit/6bf4f3bf39ee7206b1201114eec012e682d3d37f
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-12-19 (Mon, 19 Dec 2016)

  Changed paths:
    M ChangeLog
    M doc/config.rst
    M libraries/DatabaseInterface.php
    M libraries/config.default.php
    M test/classes/plugin/auth/AuthenticationHttpTest.php

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9835791bff33...6bf4f3bf39ee