From 52d7c38ef1afe6e04b0e453409267425c8fbdc75 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Thu, 1 Mar 2018 11:01:35 +0100 Subject: [PATCH] MySQL: Use CONVERT() only when searching for non-ASCII (bug #603) --- adminer/drivers/mysql.inc.php | 2 +- changes.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php index 12948b8f..71e1a825 100644 --- a/adminer/drivers/mysql.inc.php +++ b/adminer/drivers/mysql.inc.php @@ -299,7 +299,7 @@ if (!defined("DRIVER")) { } function convertSearch($idf, $val, $field) { - return (preg_match('~char|text|enum|set~', $field["type"]) && !preg_match("~^utf8~", $field["collation"]) + return (preg_match('~char|text|enum|set~', $field["type"]) && !preg_match("~^utf8~", $field["collation"]) && preg_match('~[\x80-\xFF]~', $val['val']) ? "CONVERT($idf USING " . charset($this->_conn) . ")" : $idf ); diff --git a/changes.txt b/changes.txt index 0b46da6d..7a14ccaf 100644 --- a/changes.txt +++ b/changes.txt @@ -2,6 +2,7 @@ Adminer 4.6.3-dev: Stop session before connecting Fix displaying info about non-alphabetical objects (bug #599) PDO: Support binary fields download +MySQL: Use CONVERT() only when searching for non-ASCII (bug #603) Adminer 4.6.2 (released 2018-02-20): Semi-transparent border on table actions