diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index 012eb7c1f..192cf0ec6 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -991,7 +991,6 @@ function PMA_DBI_postConnect($link, $is_controluser = false)
     if (PMA_MYSQL_MAJOR_VERSION < 2009) {
         if (! empty($GLOBALS['collation_connection'])) {
             PMA_DBI_query("SET CHARACTER SET 'utf8';", $link, PMA_DBI_QUERY_STORE);
-            $mysql_charset = explode('_', $GLOBALS['collation_connection']);
             PMA_DBI_query("SET collation_connection = '" . PMA_sqlAddslashes($GLOBALS['collation_connection']) . "';", $link, PMA_DBI_QUERY_STORE);
         } else {
             PMA_DBI_query("SET NAMES 'utf8' COLLATE 'utf8_general_ci';", $link, PMA_DBI_QUERY_STORE);
diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php
index 89aef1820..5663dd92c 100644
--- a/libraries/mysql_charsets.lib.php
+++ b/libraries/mysql_charsets.lib.php
@@ -11,7 +11,7 @@ if (! defined('PHPMYADMIN')) {
 /**
  *
  */
-if (PMA_MYSQL_MAJOR_VERSION > 2009) {
+if (PMA_MYSQL_MAJOR_VERSION >= 2009) {
     /* There are no charsets in Drizzle */
     $GLOBALS['mysql_charsets']                  = array();
     $GLOBALS['mysql_charsets_descriptions']     = array('utf8' => 'UTF-8 Unicode');