bug #1762029 [interface] Cannot upload BLOB into existing row

2 files changed, 5 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 8767c9200c..3b5e8ca733 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - patch #1957998 [display] No tilde for InnoDB row counter when we know
   it for sure, thanks to Vladyslav Bakayev - dandy76 
 - bug #1955572 [display] alt text causes duplicated strings
+- bug #1762029 [interface] Cannot upload BLOB into existing row 
   
 2.11.6.0 (2008-04-29)
 - bug #1903724 [interface] Displaying of very large queries in error message 
diff --git a/tbl_change.php b/tbl_change.php
index 960a13d396..089eec99d5 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -406,8 +406,10 @@ foreach ($loop_array as $vrowcount => $vrow) {
         // Prepares the field value
         $real_null_value = FALSE;
         if (isset($vrow)) {
-            if (!isset($vrow[$field])
-              || (function_exists('is_null') && is_null($vrow[$field]))) {
+            // On a BLOB that can have a NULL value, the is_null() returns
+            // true if it has no content but for me this is different than
+            // having been set explicitely to NULL so I put an exception here
+            if (! $is_blob && function_exists('is_null') && is_null($vrow[$field])) {
                 $real_null_value = TRUE;
                 $vrow[$field]   = '';
                 $special_chars = '';