[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 20a508: Fix comment

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 20a508358bd4102bad0ae53299b453e0f39ee5b2
      https://github.com/phpmyadmin/phpmyadmin/commit/20a508358bd4102bad0ae53299b453e0f39ee5b2
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M user_password.php

  Log Message:
  -----------
  Fix comment

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


  Commit: bfaa77ef21ab04b63d165f78d84f6b8bb716c8d8
      https://github.com/phpmyadmin/phpmyadmin/commit/bfaa77ef21ab04b63d165f78d84f6b8bb716c8d8
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M ChangeLog
    M user_password.php

  Log Message:
  -----------
  Fix password change on MariaDB 10.1 and newer

Use SET PASSWORD which seems again do the correct thing there.

Fixes #11855

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


  Commit: f141cb1463a77d1258abb2e399af99dd37d89da5
      https://github.com/phpmyadmin/phpmyadmin/commit/f141cb1463a77d1258abb2e399af99dd37d89da5
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    M ChangeLog
    M user_password.php

  Log Message:
  -----------
  Merge branch 'QA_4_5'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b231ed9dc7f0...f141cb1463a7