bug #1936761 [interface] BINARY not treated as BLOB: update/delete issues

This commit is contained in:
Marc Delisle
2008-06-01 13:02:12 +00:00
parent fac0e14389
commit c98ca858ec
2 changed files with 3 additions and 2 deletions

View File

@@ -24,6 +24,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug #1762029 [interface] Cannot upload BLOB into existing row - bug #1762029 [interface] Cannot upload BLOB into existing row
- bug #1981043 [export] HTML in exports getting corrupted, - bug #1981043 [export] HTML in exports getting corrupted,
thanks to Jason Judge - jasonjudge thanks to Jason Judge - jasonjudge
- bug #1936761 [interface] BINARY not treated as BLOB: update/delete issues
2.11.6.0 (2008-04-29) 2.11.6.0 (2008-04-29)
- bug #1903724 [interface] Displaying of very large queries in error message - bug #1903724 [interface] Displaying of very large queries in error message

View File

@@ -1970,8 +1970,8 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force
// timestamp is numeric on some MySQL 4.1 // timestamp is numeric on some MySQL 4.1
if ($meta->numeric && $meta->type != 'timestamp') { if ($meta->numeric && $meta->type != 'timestamp') {
$condition .= '= ' . $row[$i] . ' AND'; $condition .= '= ' . $row[$i] . ' AND';
} elseif ($meta->type == 'blob' } elseif (($meta->type == 'blob' || $meta->type == 'string')
// hexify only if this is a true not empty BLOB // hexify only if this is a true not empty BLOB or a BINARY
&& stristr($field_flags, 'BINARY') && stristr($field_flags, 'BINARY')
&& !empty($row[$i])) { && !empty($row[$i])) {
// do not waste memory building a too big condition // do not waste memory building a too big condition