Do not set charset for Drizzle.

2010-10-21 10:04:37 +02:00
parent 2c7161c7a3
commit ae7a20607d
1 changed files with 9 additions and 6 deletions
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -979,6 +979,8 @@ function PMA_DBI_postConnect($link, $is_controluser = false)
        }
    }

+    /* Skip charsets for Drizzle */
+    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']);
@@ -987,6 +989,7 @@ function PMA_DBI_postConnect($link, $is_controluser = false)
            PMA_DBI_query("SET NAMES 'utf8' COLLATE 'utf8_general_ci';", $link, PMA_DBI_QUERY_STORE);
        }
    }
+}

 /**
 * returns a single value from the given result or query,