Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 85f6849921e8a2ab5f0e5e2cd2f636ca93bab17c https://github.com/phpmyadmin/phpmyadmin/commit/85f6849921e8a2ab5f0e5e2cd2f6... Author: Marc Delisle marc@infomarc.info Date: 2015-09-02 (Wed, 02 Sep 2015)

Changed paths: M libraries/server_privileges.lib.php

Log Message: ----------- Avoid fetching a variable that was only introduced in MySQL 5.7.2

Fix a notice due to the new way of fetching system variables

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: 4fe8c5f496aac45559c081ee610ea425ec593419 https://github.com/phpmyadmin/phpmyadmin/commit/4fe8c5f496aac45559c081ee610e... Author: Marc Delisle marc@infomarc.info Date: 2015-09-02 (Wed, 02 Sep 2015)

Changed paths: M libraries/server_privileges.lib.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e24e0a693133...4fe8c5f496aa