diff --git a/src/include/dedesql.class.php b/src/include/dedesql.class.php
index 639d5e8e..1df61443 100755
--- a/src/include/dedesql.class.php
+++ b/src/include/dedesql.class.php
@@ -137,10 +137,9 @@ class DedeSql
         @mysql_select_db($this->dbName, $this->linkID);
         $mysqlver = explode('.',$this->GetVersion());
         $mysqlver = $mysqlver[0].'.'.$mysqlver[1];
-		
-        if($mysqlver>4.0)
+        if (version_compare($mysqlver,'4.0',">=") && $GLOBALS['cfg_db_language'])
         {
-            @mysql_query("SET NAMES '".$GLOBALS['cfg_db_language']."', character_set_client=binary, sql_mode='', interactive_timeout=3600 ;", $this->linkID);
+            @mysql_query($this->linkID, "SET character_set_connection=" . $GLOBALS['cfg_db_language'] . ",character_set_results=" . $GLOBALS['cfg_db_language'] . ",character_set_client=binary");
         }
 
         return TRUE;
diff --git a/src/include/dedesqli.class.php b/src/include/dedesqli.class.php
index 621e018b..ea429d94 100755
--- a/src/include/dedesqli.class.php
+++ b/src/include/dedesqli.class.php
@@ -140,7 +140,7 @@ class DedeSqli
         }
 		$this->isInit = TRUE;
         $serverinfo = mysqli_get_server_info($this->linkID);
-        if ($serverinfo > '4.1' && $GLOBALS['cfg_db_language'])
+        if (version_compare($serverinfo,'4.1',">=") && $GLOBALS['cfg_db_language'])
         {
             mysqli_query($this->linkID, "SET character_set_connection=" . $GLOBALS['cfg_db_language'] . ",character_set_results=" . $GLOBALS['cfg_db_language'] . ",character_set_client=binary");
         }