nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not set charset for Drizzle.

Browse Source
This commit is contained in:
Michal Čihař
2010-10-21 10:04:37 +02:00
parent 2c7161c7a3
commit ae7a20607d
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/database_interface.lib.php
View File

@@ -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'])) { if (! empty($GLOBALS['collation_connection'])) {
PMA_DBI_query("SET CHARACTER SET 'utf8';", $link, PMA_DBI_QUERY_STORE); PMA_DBI_query("SET CHARACTER SET 'utf8';", $link, PMA_DBI_QUERY_STORE);
$mysql_charset = explode('_', $GLOBALS['collation_connection']); $mysql_charset = explode('_', $GLOBALS['collation_connection']);
@@ -986,6 +988,7 @@ function PMA_DBI_postConnect($link, $is_controluser = false)
} else { } else {
PMA_DBI_query("SET NAMES 'utf8' COLLATE 'utf8_general_ci';", $link, PMA_DBI_QUERY_STORE); PMA_DBI_query("SET NAMES 'utf8' COLLATE 'utf8_general_ci';", $link, PMA_DBI_QUERY_STORE);
} }
}
} }
/** /**