From 88e6ca46094128f53ec922dc14d7b63d3ee6e910 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 21 Oct 2010 10:04:49 +0200 Subject: [PATCH] Avoid charset queries on Drizzle. --- libraries/mysql_charsets.lib.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php index 51102f836..2463f1f82 100644 --- a/libraries/mysql_charsets.lib.php +++ b/libraries/mysql_charsets.lib.php @@ -11,8 +11,18 @@ if (! defined('PHPMYADMIN')) { /** * */ - -if (! PMA_cacheExists('mysql_charsets_count', true)) { +if (PMA_MYSQL_MAJOR_VERSION > 2009) { + /* There are no charsets in Drizzle */ + $GLOBALS['mysql_charsets'] = array(); + $GLOBALS['mysql_charsets_descriptions'] = array(); + $GLOBALS['mysql_charsets_count'] = 0; + $GLOBALS['mysql_charsets_available'] = array(); + $GLOBALS['mysql_collations'] = array(); + $GLOBALS['mysql_default_collations'] = array(); + $GLOBALS['mysql_collations_flat'] = array(); + $GLOBALS['mysql_collations_count'] = 0; + $GLOBALS['mysql_collations_available'] = array(); +} elseif (! PMA_cacheExists('mysql_charsets_count', true)) { $res = PMA_DBI_query('SHOW CHARACTER SET;'); $mysql_charsets = array();