gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #16777 - Non-UTF8 Primary Key fix

Browse Source 
Signed-off-by: Saksham Gupta <shucon01@gmail.com>
This commit is contained in:
Saksham Gupta 2021-04-15 15:02:10 +05:30 committed by William Desportes
parent fe306b28ee
commit 43e39ab08b
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/classes/Util.php
View File

@ -957,6 +957,9 @@ class Util
}
$conditionValue = '';
$isBinaryString = $meta->type === 'string' && stripos($fieldFlags, 'BINARY') !== false;
// 63 is the binary charset, see: https://dev.mysql.com/doc/internals/en/charsets.html
$isBlobAndIsBinaryCharset = $meta->type === 'blob' && $meta->charsetnr === 63;
// timestamp is numeric on some MySQL 4.1
// for real we use CONCAT above and it should compare to string
if ($meta->numeric
@ -964,10 +967,7 @@ class Util
&& ($meta->type !== 'real')
) {
$conditionValue = '= ' . $row;
} elseif (($meta->type === 'blob') || ($meta->type === 'string')
&& stripos($fieldFlags, 'BINARY') !== false
&& ! empty($row)
) {
} elseif ($isBlobAndIsBinaryCharset || (! empty($row) && $isBinaryString)) {
// hexify only if this is a true not empty BLOB or a BINARY
// do not waste memory building a too big condition