Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e50e37b51db956bcb34258491548bd7d04423711 https://github.com/phpmyadmin/phpmyadmin/commit/e50e37b51db956bcb34258491548... Author: Michal Čihař michal@cihar.com Date: 2016-06-22 (Wed, 22 Jun 2016)

Changed paths: M libraries/server_privileges.lib.php M test/libraries/PMA_server_privileges_test.php

Log Message: ----------- Properly escape database name when listing privileges

Signed-off-by: Michal Čihař michal@cihar.com

Commit: d338a61d329a019ab20e1d949c584db4371b4598 https://github.com/phpmyadmin/phpmyadmin/commit/d338a61d329a019ab20e1d949c58... Author: Michal Čihař michal@cihar.com Date: 2016-06-22 (Wed, 22 Jun 2016)

Changed paths: M libraries/server_privileges.lib.php M test/libraries/PMA_server_privileges_test.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5b8608657ff8...d338a61d329a