bk commit into 5.1 tree (mskold:1.2279)

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.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@stripped, 2006-08-15 11:49:04+02:00, mskold@stripped +5 -0
  Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
  into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
  MERGE: 1.1810.1976.3

  mysql-test/r/ndb_lock.result@stripped, 2006-08-15 11:48:48+02:00, mskold@stripped +0 -12
    Merge (using local)
    MERGE: 1.5.1.7

  mysql-test/t/ndb_lock.test@stripped, 2006-08-15 11:48:05+02:00, mskold@stripped +0 -0
    Auto merged
    MERGE: 1.7.1.7

  sql/ha_ndbcluster.cc@stripped, 2006-08-15 11:48:05+02:00, mskold@stripped +0 -0
    Auto merged
    MERGE: 1.175.1.99

  sql/ha_ndbcluster.h@stripped, 2006-08-15 11:48:05+02:00, mskold@stripped +0 -0
    Auto merged
    MERGE: 1.82.1.17

  storage/ndb/include/ndbapi/NdbTransaction.hpp@stripped, 2006-08-15 11:48:05+02:00, mskold@stripped +0 -0
    Auto merged
    MERGE: 1.41.2.2

  storage/ndb/include/ndbapi/NdbTransaction.hpp@stripped, 2006-08-15 11:48:05+02:00, mskold@stripped +0 -0
    Merge rename: ndb/include/ndbapi/NdbTransaction.hpp -> storage/ndb/include/ndbapi/NdbTransaction.hpp

# 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:	/windows/Linux_space/MySQL/mysql-5.1/RESYNC

--- 1.41.2.1/ndb/include/ndbapi/NdbTransaction.hpp	2006-08-15 11:49:12 +02:00
+++ 1.47/storage/ndb/include/ndbapi/NdbTransaction.hpp	2006-08-15 11:49:12 +02:00
@@ -657,7 +657,7 @@ private:						
   // Release all cursor operations in connection
   void releaseOps(NdbOperation*);	
   void releaseScanOperations(NdbIndexScanOperation*);	
-  void releaseExecutedScanOperation(NdbIndexScanOperation*);
+  void releaseScanOperation(NdbIndexScanOperation*);
 
   // Set the transaction identity of the transaction
   void		setTransactionId(Uint64 aTransactionId);
@@ -792,7 +792,7 @@ private:						
   bool theBlobFlag;
   Uint8 thePendingBlobOps;
 
-  static void sendTC_COMMIT_ACK(NdbApiSignal *,
+  static void sendTC_COMMIT_ACK(class TransporterFacade *, NdbApiSignal *,
 				Uint32 transId1, Uint32 transId2, 
 				Uint32 aBlockRef);
 

--- 1.12/mysql-test/t/ndb_lock.test	2006-08-15 11:49:12 +02:00
+++ 1.13/mysql-test/t/ndb_lock.test	2006-08-15 11:49:12 +02:00
@@ -73,7 +73,7 @@ drop table t1;
 
 create table t1 (x integer not null primary key, y varchar(32), z integer, key(z)) engine = ndb;
 
-insert into t1 values (1,'one',1), (2,'two',2),(3,"three",3); 
+insert into t1 values (1,'one',1);
 
 # PK access
 connection con1;
@@ -82,9 +82,20 @@ select * from t1 where x = 1 for update;
 
 connection con2;
 begin;
-select * from t1 where x = 2 for update;
 --error 1205
 select * from t1 where x = 1 for update;
+rollback;
+
+connection con1;
+rollback;
+insert into t1 values (2,'two',2),(3,"three",3); 
+begin;
+select * from t1 where x = 1 for update;
+
+connection con2;
+--error 1205
+select * from t1 where x = 1 for update;
+select * from t1 where x = 2 for update;
 rollback;
 
 connection con1;