Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  mysql.com:/home/mysql_src/mysql-5.1-new-WL3146-handler


sql/ha_berkeley.cc:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/archive/ha_archive.cc:
  Auto merged
storage/archive/ha_archive.h:
  Auto merged

1 files changed, 2 insertions, 2 deletions

diff --git a/sql/log_event.cc b/sql/log_event.cc
index cbf1875c9ec..0f8d4146917 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -6130,7 +6130,7 @@ int Write_rows_log_event::do_before_row_operations(TABLE *table)
     how many rows are going to be inserted, then it can allocate needed memory
     from the start.
   */
-  table->file->start_bulk_insert(0);
+  table->file->ha_start_bulk_insert(0);
   /*
     We need TIMESTAMP_NO_AUTO_SET otherwise ha_write_row() will not use fill
     any TIMESTAMP column with data from the row but instead will use
@@ -6153,7 +6153,7 @@ int Write_rows_log_event::do_before_row_operations(TABLE *table)
 int Write_rows_log_event::do_after_row_operations(TABLE *table, int error)
 {
   if (error == 0)
-    error= table->file->end_bulk_insert();
+    error= table->file->ha_end_bulk_insert();
   return error;
 }