Branch: refs/heads/QA_4_2 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 48b97ecd064402134531af15124cb7d79c1f2e27 https://github.com/phpmyadmin/phpmyadmin/commit/48b97ecd064402134531af15124c... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2014-10-07 (Tue, 07 Oct 2014) Changed paths: M ChangeLog M libraries/Util.class.php Log Message: ----------- bug #4252 Database-level permission bug for db names containing underscores Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: d2b9979d03baedf8ddf3543ea864fdbade917af8 https://github.com/phpmyadmin/phpmyadmin/commit/d2b9979d03baedf8ddf3543ea864... Author: Marc Delisle <marc@infomarc.info> Date: 2014-10-07 (Tue, 07 Oct 2014) Changed paths: M ChangeLog M libraries/Util.class.php Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc@infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/eefd44a89b9f...d2b9979d03ba