From c98ca858ec030485be530bb74c089e6d33d9dc56 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 1 Jun 2008 13:02:12 +0000 Subject: [PATCH] bug #1936761 [interface] BINARY not treated as BLOB: update/delete issues --- ChangeLog | 1 + libraries/common.lib.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ab3d74d34..dc0bc98ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #1762029 [interface] Cannot upload BLOB into existing row - bug #1981043 [export] HTML in exports getting corrupted, thanks to Jason Judge - jasonjudge +- bug #1936761 [interface] BINARY not treated as BLOB: update/delete issues 2.11.6.0 (2008-04-29) - bug #1903724 [interface] Displaying of very large queries in error message diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 7d7ee2351..6daf30d0c 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1970,8 +1970,8 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force // timestamp is numeric on some MySQL 4.1 if ($meta->numeric && $meta->type != 'timestamp') { $condition .= '= ' . $row[$i] . ' AND'; - } elseif ($meta->type == 'blob' - // hexify only if this is a true not empty BLOB + } elseif (($meta->type == 'blob' || $meta->type == 'string') + // hexify only if this is a true not empty BLOB or a BINARY && stristr($field_flags, 'BINARY') && !empty($row[$i])) { // do not waste memory building a too big condition