MySQL: Use CONVERT() only when searching for non-ASCII (bug #603)

diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
index 12948b8f3ff58516794556f07241e0f5af078f82..71e1a825020b2df3ba6988b4e4309aa6bb5ccb48 100644 (file)
--- 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 0b46da6d7ddca1d7baff5b48635d92464d286d47..7a14ccaf6ff3cf0ef89c2195754f675787024742 100644 (file)
--- 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