bk commit into 5.1 tree (kaa:1.2484)

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
5.1 repository of kaa. When kaa does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-04-26 20:30:54+04:00, kaa@stripped +1 -0
  Merge ssh://kaa@stripped//home/kaa/src/maint/bug22364/my51-bug22364
  into  fluffy.local:/Users/kaa/maint/mysql-5.1-maint
  MERGE: 1.2469.188.1

  sql/sql_update.cc@stripped, 2007-04-26 20:30:48+04:00, kaa@stripped +0 -0
    Auto merged
    MERGE: 1.233.3.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kaa
# Host:	fluffy.local
# Root:	/Users/kaa/maint/mysql-5.1-maint/RESYNC

--- 1.237/sql/sql_update.cc	2007-04-13 10:25:45 +04:00
+++ 1.238/sql/sql_update.cc	2007-04-26 20:30:48 +04:00
@@ -1478,18 +1478,18 @@
       memcpy((char*) tmp_table->field[0]->ptr,
 	     (char*) table->file->ref, table->file->ref_length);
       /* Write row, ignoring duplicated updates to a row */
-      if ((error= tmp_table->file->ha_write_row(tmp_table->record[0])))
+      error= tmp_table->file->ha_write_row(tmp_table->record[0]);
+      if (tmp_table->file->is_fatal_error(error, HA_CHECK_DUP))
       {
-        if (tmp_table->file->is_fatal_error(error, HA_CHECK_DUP) &&
+        if (error &&
             create_myisam_from_heap(thd, tmp_table,
-                                         tmp_table_param + offset, error, 1))
-	{
-	  do_update=0;
-	  DBUG_RETURN(1);			// Not a table_is_full error
-	}
-      }
-      else
+                                    tmp_table_param + offset, error, 1))
+        {
+          do_update= 0;
+          DBUG_RETURN(1);			// Not a table_is_full error
+        }
         found++;
+      }
     }
   }
   DBUG_RETURN(0);