diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php
index 51b79ba27d..8d1eb83c87 100644
--- a/libraries/mysql_charsets.lib.php
+++ b/libraries/mysql_charsets.lib.php
@@ -11,7 +11,7 @@ if (! defined('PHPMYADMIN')) {
 /**
  *
  */
-if (! PMA_cacheExists('mysql_charsets_count', true)) {
+if (! PMA_cacheExists('mysql_charsets', true)) {
     $sql = PMA_DRIZZLE
         ? 'SELECT * FROM data_dictionary.CHARACTER_SETS'
         : 'SELECT * FROM information_schema.CHARACTER_SETS';
@@ -26,7 +26,6 @@ if (! PMA_cacheExists('mysql_charsets_count', true)) {
     }
     PMA_DBI_free_result($res);
 
-    $mysql_charsets_count = count($mysql_charsets);
     sort($mysql_charsets, SORT_STRING);
 
     $mysql_collations = array_flip($mysql_charsets);
@@ -60,7 +59,6 @@ if (! PMA_cacheExists('mysql_charsets_count', true)) {
         unset($mysql_collations['utf8_general_ci']);
     }
 
-    $mysql_collations_count = count($mysql_collations_flat);
     sort($mysql_collations_flat, SORT_STRING);
     foreach ($mysql_collations AS $key => $value) {
         sort($mysql_collations[$key], SORT_STRING);
@@ -70,22 +68,18 @@ if (! PMA_cacheExists('mysql_charsets_count', true)) {
 
     PMA_cacheSet('mysql_charsets', $GLOBALS['mysql_charsets'], true);
     PMA_cacheSet('mysql_charsets_descriptions', $GLOBALS['mysql_charsets_descriptions'], true);
-    PMA_cacheSet('mysql_charsets_count', $GLOBALS['mysql_charsets_count'], true);
     PMA_cacheSet('mysql_charsets_available', $GLOBALS['mysql_charsets_available'], true);
     PMA_cacheSet('mysql_collations', $GLOBALS['mysql_collations'], true);
     PMA_cacheSet('mysql_default_collations', $GLOBALS['mysql_default_collations'], true);
     PMA_cacheSet('mysql_collations_flat', $GLOBALS['mysql_collations_flat'], true);
-    PMA_cacheSet('mysql_collations_count', $GLOBALS['mysql_collations_count'], true);
     PMA_cacheSet('mysql_collations_available', $GLOBALS['mysql_collations_available'], true);
 } else {
     $GLOBALS['mysql_charsets']                  = PMA_cacheGet('mysql_charsets', true);
     $GLOBALS['mysql_charsets_descriptions']     = PMA_cacheGet('mysql_charsets_descriptions', true);
-    $GLOBALS['mysql_charsets_count']            = PMA_cacheGet('mysql_charsets_count', true);
     $GLOBALS['mysql_charsets_available']        = PMA_cacheGet('mysql_charsets_available', true);
     $GLOBALS['mysql_collations']                = PMA_cacheGet('mysql_collations', true);
     $GLOBALS['mysql_default_collations']        = PMA_cacheGet('mysql_default_collations', true);
     $GLOBALS['mysql_collations_flat']           = PMA_cacheGet('mysql_collations_flat', true);
-    $GLOBALS['mysql_collations_count']          = PMA_cacheGet('mysql_collations_count', true);
     $GLOBALS['mysql_collations_available']      = PMA_cacheGet('mysql_collations_available', true);
 }
 
diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
index 1066b6b499..171a4a3cc6 100644
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -48,9 +48,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
     }
     if (! isset($mysql_charsets)) {
         $mysql_charsets = array();
-        $mysql_charsets_count = 0;
         $mysql_collations_flat = array();
-        $mysql_collations_count = 0;
     }
 
     if (!defined('DEBUG_TIMING')) {
@@ -195,8 +193,6 @@ if (! defined('PMA_MINIMUM_COMMON')) {
      * @global array    MySQL function names
      * @global array    List of available character sets
      * @global array    List of available collations
-     * @global integer  Character sets count
-     * @global integer  Collations count
      *
      * @access public
      */
@@ -204,7 +200,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
     {
         global $PMA_SQPdata_column_attrib, $PMA_SQPdata_reserved_word, $PMA_SQPdata_column_type;
         global $PMA_SQPdata_function_name, $PMA_SQPdata_forbidden_word;
-        global $mysql_charsets, $mysql_collations_flat, $mysql_charsets_count, $mysql_collations_count;
+        global $mysql_charsets, $mysql_collations_flat;
 
         // Convert all line feeds to Unix style
         $sql = str_replace("\r\n", "\n", $sql);
@@ -215,11 +211,14 @@ if (! defined('PMA_MINIMUM_COMMON')) {
             return array();
         }
 
+        // Get counts of some arrays
         $PMA_SQPdata_column_attrib_cnt  = count($PMA_SQPdata_column_attrib);
         $PMA_SQPdata_function_name_cnt  = count($PMA_SQPdata_function_name);
         $PMA_SQPdata_reserved_word_cnt  = count($PMA_SQPdata_reserved_word);
         $PMA_SQPdata_forbidden_word_cnt = count($PMA_SQPdata_forbidden_word);
         $PMA_SQPdata_column_type_cnt    = count($PMA_SQPdata_column_type);
+        $mysql_charsets_count = count($mysql_charsets);
+        $mysql_collations_count = count($mysql_collations_flat);
 
         $sql_array               = array();
         $sql_array['raw']        = $sql;
diff --git a/server_collations.php b/server_collations.php
index 0adc4d3291..44d5157518 100644
--- a/server_collations.php
+++ b/server_collations.php
@@ -55,7 +55,7 @@ echo '<div id="div_mysql_charset_collations">' . "\n"
    . '</tr>' . "\n";
 
 $i = 0;
-$table_row_count = count($mysql_charsets) + $mysql_collations_count;
+$table_row_count = count($mysql_charsets) + count($mysql_collations);
 
 foreach ($mysql_charsets as $current_charset) {
     if ($i >= $table_row_count / 2) {