The branch, master has been updated
via b02955420cb21bdd55c7607e6ffac75d80edbdfd (commit)
via dcf0e4235a1035ebb8f6752df4fb41330ba34157 (commit)
from 31d97f75c9a1ebb2e63a4c511d17c85b75f878cf (commit)
- Log -----------------------------------------------------------------
commit b02955420cb21bdd55c7607e6ffac75d80edbdfd
Author: Piotr Przybylski <piotrprz(a)gmail.com>
Date: Thu Feb 17 02:48:59 2011 +0100
make Drizzle version checks consistent
commit dcf0e4235a1035ebb8f6752df4fb41330ba34157
Author: Piotr Przybylski <piotrprz(a)gmail.com>
Date: Thu Feb 17 02:46:05 2011 +0100
remove unused variable
-----------------------------------------------------------------------
Summary of changes:
libraries/database_interface.lib.php | 1 -
libraries/mysql_charsets.lib.php | 2 +-
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index 012eb7c..192cf0e 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -991,7 +991,6 @@ function PMA_DBI_postConnect($link, $is_controluser = false)
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']);
PMA_DBI_query("SET collation_connection = '" .
PMA_sqlAddslashes($GLOBALS['collation_connection']) . "';", $link,
PMA_DBI_QUERY_STORE);
} else {
PMA_DBI_query("SET NAMES 'utf8' COLLATE
'utf8_general_ci';", $link, PMA_DBI_QUERY_STORE);
diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php
index 89aef18..5663dd9 100644
--- a/libraries/mysql_charsets.lib.php
+++ b/libraries/mysql_charsets.lib.php
@@ -11,7 +11,7 @@ if (! defined('PHPMYADMIN')) {
/**
*
*/
-if (PMA_MYSQL_MAJOR_VERSION > 2009) {
+if (PMA_MYSQL_MAJOR_VERSION >= 2009) {
/* There are no charsets in Drizzle */
$GLOBALS['mysql_charsets'] = array();
$GLOBALS['mysql_charsets_descriptions'] = array('utf8' =>
'UTF-8 Unicode');
hooks/post-receive
--
phpMyAdmin