mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-10 08:34:20 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jakub Vrana
2018-03-01 11:01:35 +01:00
parent 53dd78f5af
commit 52d7c38ef1
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adminer/drivers/mysql.inc.php
View File

@@ -299,7 +299,7 @@ if (!defined("DRIVER")) {
} }
function convertSearch($idf, $val, $field) { 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) . ")" ? "CONVERT($idf USING " . charset($this->_conn) . ")"
: $idf : $idf
); );

1
changes.txt
View File

@@ -2,6 +2,7 @@ Adminer 4.6.3-dev:
Stop session before connecting Stop session before connecting
Fix displaying info about non-alphabetical objects (bug #599) Fix displaying info about non-alphabetical objects (bug #599)
PDO: Support binary fields download PDO: Support binary fields download
MySQL: Use CONVERT() only when searching for non-ASCII (bug #603)
Adminer 4.6.2 (released 2018-02-20): Adminer 4.6.2 (released 2018-02-20):
Semi-transparent border on table actions Semi-transparent border on table actions