Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8e3668044c0ec3a130ac52813e6f17d976754bda https://github.com/phpmyadmin/phpmyadmin/commit/8e3668044c0ec3a130ac52813e6f... Author: Marc Delisle <marc@infomarc.info> Date: 2015-03-24 (Tue, 24 Mar 2015) Changed paths: M ChangeLog M libraries/server_privileges.lib.php Log Message: ----------- bug #4818 MySQL 5.7.6 and changing the password for another user Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: f72eabf3b9a24ec9a34135bbd505ddf126229d8c https://github.com/phpmyadmin/phpmyadmin/commit/f72eabf3b9a24ec9a34135bbd505... Author: Marc Delisle <marc@infomarc.info> Date: 2015-03-24 (Tue, 24 Mar 2015) Changed paths: M ChangeLog M libraries/server_privileges.lib.php Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc@infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/96c627101c79...f72eabf3b9a2