beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

MySQL: Fix usage of utf8mb4 if the client library doesn't support it

Browse source
This commit is contained in:
Jakub Vrana 2015-03-08 13:06:45 -07:00
parent ea04a7e2c6
commit 0025f2188a
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
adminer/drivers/mysql.inc.php
View file

@ -27,6 +27,12 @@ if (!defined("DRIVER")) {
return $return;
}
function set_charset($charset) {
// the client library may not support utf8mb4
parent::set_charset('utf8');
return $this->query("SET NAMES $charset");
}
function result($query, $field = 0) {
$result = $this->query($query);
if (!$result) {
@ -35,7 +41,7 @@ if (!defined("DRIVER")) {
$row = $result->fetch_array();
return $row[$field];
}
function quote($string) {
return "'" . $this->escape_string($string) . "'";
}
@ -80,7 +86,8 @@ if (!defined("DRIVER")) {
*/
function set_charset($charset) {
if (function_exists('mysql_set_charset')) {
return mysql_set_charset($charset, $this->_link);
// the client library may not support utf8mb4
mysql_set_charset('utf8', $this->_link);
}
return $this->query("SET NAMES $charset");
}

1
changes.txt
View file

@ -1,5 +1,6 @@
Adminer 4.2.1-dev:
Send referrer header to the same domain
MySQL: Fix usage of utf8mb4 if the client library doesn't support it
MySQL: Use utf8mb4 in export only if required
SQLite: Use EXPLAIN QUERY PLAN in SQL query