bk commit into 5.0 tree (serg:1.2036)

[serg]

Below is the list of changes that have just been committed into a local
5.0 repository of mysqldev. When mysqldev 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.2036 05/09/30 20:30:09 serg@stripped +2 -0
  Merge

  sql/handler.h
    1.156 05/09/30 20:28:32 mysqldev@stripped +0 -0
    SCCS merged

  sql/ha_ndbcluster.cc
    1.211 05/09/30 20:28:32 mysqldev@stripped +0 -0
    SCCS 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:	serg
# Host:	production.mysql.com
# Root:	/data0/mysqldev/my/mysql-5.0-release/RESYNC

--- 1.155/sql/handler.h	2005-09-30 12:20:11 +02:00
+++ 1.156/sql/handler.h	2005-09-30 20:28:32 +02:00
@@ -654,7 +654,7 @@
   virtual int reset() { return extra(HA_EXTRA_RESET); }
   virtual int external_lock(THD *thd, int lock_type) { return 0; }
   virtual void unlock_row() {}
-  virtual int start_stmt(THD *thd) {return 0;}
+  virtual int start_stmt(THD *thd, thr_lock_type lock_type) {return 0;}
   /*
     This is called to delete all rows in a table
     If the handler don't support this, then this function will

--- 1.210/sql/ha_ndbcluster.cc	2005-09-30 12:20:10 +02:00
+++ 1.211/sql/ha_ndbcluster.cc	2005-09-30 20:28:32 +02:00
@@ -3401,7 +3401,7 @@
   startTransaction for each transaction/statement.
 */
 
-int ha_ndbcluster::start_stmt(THD *thd)
+int ha_ndbcluster::start_stmt(THD *thd, thr_lock_type lock_type)
 {
   int error=0;
   DBUG_ENTER("start_stmt");