bk commit into 4.1 tree (mskold:1.2491)

[Martin Skold]

Below is the list of changes that have just been committed into a local
4.1 repository of marty. When marty 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.2491 06/06/12 09:27:04 mskold@stripped +1 -0
  Moved back comment to  correct method

  sql/ha_ndbcluster.cc
    1.184 06/06/12 09:26:16 mskold@stripped +12 -5
    Moved back comment to  correct method

# 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:	mskold
# Host:	linux.site
# Root:	/home/marty/MySQL/mysql-4.1

--- 1.183/sql/ha_ndbcluster.cc	2006-06-08 16:12:08 +02:00
+++ 1.184/sql/ha_ndbcluster.cc	2006-06-12 09:26:16 +02:00
@@ -3426,11 +3426,10 @@ int ha_ndbcluster::external_lock(THD *th
 }
 
 /*
-  Start a transaction for running a statement if one is not
-  already running in a transaction. This will be the case in
-  a BEGIN; COMMIT; block
-  When using LOCK TABLE's external_lock will start a transaction
-  since ndb does not currently does not support table locking
+  Unlock the last row read in an open scan.
+  Rows are unlocked by default in ndb, but
+  for SELECT FOR UPDATE and SELECT LOCK WIT SHARE MODE
+  locks are kept if unlock_row() is not called.
 */
 
 void ha_ndbcluster::unlock_row() 
@@ -3441,6 +3440,14 @@ void ha_ndbcluster::unlock_row() 
   m_lock_tuple= false;
   DBUG_VOID_RETURN;
 }
+
+/*
+  Start a transaction for running a statement if one is not
+  already running in a transaction. This will be the case in
+  a BEGIN; COMMIT; block
+  When using LOCK TABLE's external_lock will start a transaction
+  since ndb does not currently does not support table locking
+*/
 
 int ha_ndbcluster::start_stmt(THD *thd)
 {