Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6a53b89cb7fa9e74ec05e04654242e3368122d00 https://github.com/phpmyadmin/phpmyadmin/commit/6a53b89cb7fa9e74ec05e0465424... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-10-03 (Mon, 03 Oct 2016)

Changed paths: M libraries/server_privileges.lib.php

Log Message: ----------- Escape database name properly to be used in MySQL wildcard statements

Fix #12602

Signed-off-by: Deven Bansod devenbansod.bits@gmail.com

Commit: c202b7a87ce0318e848faa6e5d8a24f3f1e9313f https://github.com/phpmyadmin/phpmyadmin/commit/c202b7a87ce0318e848faa6e5d8a... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-10-03 (Mon, 03 Oct 2016)

Changed paths: M po/id.po M po/zh_CN.po

Log Message: ----------- Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b9adbff762a3...c202b7a87ce0