From a498a6c8cb73ca5aaec14f4857618c47081febe6 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 6 Oct 2013 09:32:24 -0400
Subject: [PATCH] bug #3995 Drizzle server charset notice

---
 ChangeLog                   | 1 +
 index.php                   | 8 +++++---
 libraries/sqlparser.lib.php | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1282e406c5..91218b14cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog
 4.0.9.0 (not yet released)
 - bug #4104 Can't edit updatable view when searching
 - bug #4108 Missing refresh by deleting databases
+- bug #3995 Drizzle server charset notice
 
 4.0.8.0 (2013-10-06)
 - bug #3988 Rename view is not working
diff --git a/index.php b/index.php
index d2ecef1288..8c3c809683 100644
--- a/index.php
+++ b/index.php
@@ -258,9 +258,11 @@ if ($server > 0 && $GLOBALS['cfg']['ShowServerInfo']) {
 
     echo '    <li id="li_select_mysql_charset">';
     echo '        ' . __('Server charset') . ': '
-       . '        <span lang="en" dir="ltr">'
-       . '           ' . $mysql_charsets_descriptions[$mysql_charset_map['utf-8']] . "\n"
-       . '           (' . $mysql_charset_map['utf-8'] . ')' . "\n"
+       . '        <span lang="en" dir="ltr">';
+    if (! PMA_DRIZZLE) {
+        echo '           ' . $mysql_charsets_descriptions[$mysql_charset_map['utf-8']] . "\n";
+    }
+    echo '           (' . $mysql_charset_map['utf-8'] . ')' . "\n"
        . '        </span>' . "\n"
        . '    </li>' . "\n";
     echo '  </ul>';
diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
index 0f1caa0420..482d9cb758 100644
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -43,7 +43,7 @@ require_once './libraries/sqlparser.data.php';
 /**
  * Charset information
  */
-if (!defined('TESTSUITE')) {
+if (!defined('TESTSUITE') && ! PMA_DRIZZLE) {
     include_once './libraries/mysql_charsets.lib.php';
 }
 if (! isset($mysql_charsets)) {