bk commit into 5.1 tree (mats:1.1861)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats 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
  1.1861 05/04/12 14:04:30 mats@stripped +1 -0
  Merge mysql.com:/home/bkroot/mysql-5.1-wl2325
  into mysql.com:/home/bk/w2324-mysql-5.1

  sql/handler.cc
    1.155 05/04/12 14:04:28 mats@stripped +0 -0
    Auto merged

# 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:	mats
# Host:	romeo.kindahl.net
# Root:	/home/bk/w2324-mysql-5.1/RESYNC

--- 1.154/sql/handler.cc	2005-04-09 14:52:32 +02:00
+++ 1.155/sql/handler.cc	2005-04-12 14:04:28 +02:00
@@ -2414,7 +2414,7 @@
       && !this->is_injective()) 
   {
     bitvector const cols(table->s->fields, true);
-    thd->write_row(table, cols, buf);
+    thd->write_row(table, table->file->has_transactions(), cols, buf);
   }
 #endif
   DBUG_PRINT("exit", ("error = %d", 0));
@@ -2447,7 +2447,8 @@
       && !this->is_injective()) 
   {
     bitvector const cols(table->s->fields, true);
-    thd->update_row(table, cols, old_data, new_data);
+    thd->update_row(table, table->file->has_transactions(), 
+		    cols, old_data, new_data);
   }
 #endif
   DBUG_PRINT("exit", ("error = %d", 0));
@@ -2480,7 +2481,8 @@
       && !this->is_injective()) 
   {
     bitvector const cols(table->s->fields, true);
-    thd->delete_row(table, cols, buf);
+    thd->delete_row(table, table->file->has_transactions(),
+		    cols, buf);
   }
 #endif
   DBUG_PRINT("exit", ("error = %d", 0));