bk commit into 5.1 tree (mskold:1.2346)

[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-11-29 11:55:52+01:00, mskold@stripped +2 -0
  Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
  into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
  MERGE: 1.1810.2279.3

  mysql-test/r/ndb_update.result@stripped, 2006-11-29 11:55:46+01:00, mskold@stripped +0 -0
    Auto merged
    MERGE: 1.5.2.1

  storage/ndb/src/common/util/socket_io.cpp@stripped, 2006-11-29 11:55:46+01:00, mskold@stripped +0 -5
    Auto merged
    MERGE: 1.7.5.2

  storage/ndb/src/common/util/socket_io.cpp@stripped, 2006-11-29 11:55:46+01:00, mskold@stripped +0 -0
    Merge rename: ndb/src/common/util/socket_io.cpp -> storage/ndb/src/common/util/socket_io.cpp

# 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.7.5.1/ndb/src/common/util/socket_io.cpp	2006-11-29 11:56:02 +01:00
+++ 1.12/storage/ndb/src/common/util/socket_io.cpp	2006-11-29 11:56:02 +01:00
@@ -49,7 +49,7 @@ read_socket(NDB_SOCKET_TYPE socket, int 
 extern "C"
 int
 readln_socket(NDB_SOCKET_TYPE socket, int timeout_millis,
-	      char * buf, int buflen){
+	      char * buf, int buflen, NdbMutex *mutex){
   if(buflen <= 1)
     return 0;
 
@@ -61,7 +61,12 @@ readln_socket(NDB_SOCKET_TYPE socket, in
   timeout.tv_sec  = (timeout_millis / 1000);
   timeout.tv_usec = (timeout_millis % 1000) * 1000;
 
+  if(mutex)
+    NdbMutex_Unlock(mutex);
   const int selectRes = select(socket + 1, &readset, 0, 0, &timeout);
+  if(mutex)
+    NdbMutex_Lock(mutex);
+
   if(selectRes == 0){
     return 0;
   }

--- 1.14/mysql-test/r/ndb_update.result	2006-11-29 11:56:02 +01:00
+++ 1.15/mysql-test/r/ndb_update.result	2006-11-29 11:56:02 +01:00
@@ -17,6 +17,14 @@ pk1	b	c
 0	0	0
 2	2	2
 4	1	1
+UPDATE t1 set pk1 = 4 where pk1 = 2;
+ERROR 23000: Duplicate entry '4' for key 1
+UPDATE IGNORE t1 set pk1 = 4 where pk1 = 2;
+select * from t1 order by pk1;
+pk1	b	c
+0	0	0
+2	2	2
+4	1	1
 UPDATE t1 set pk1 = 1, c = 2 where pk1 = 4;
 ERROR 23000: Duplicate entry '' for key '*UNKNOWN*'
 select * from t1 order by pk1;