From: Date: July 11 2005 7:23pm
Subject: bk commit into 5.0 tree (heikki:1.1907) BUG#3300
List-Archive: http://lists.mysql.com/internals/26909
X-Bug: 3300
Message-Id: <200507111723.j6BHNdlg014065@hundin.mysql.fi>

Below is the list of changes that have just been committed into a local
5.0 repository of heikki. When heikki 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.1907 05/07/11 20:23:25 heikki@stripped +2 -0
  sql_update.cc:
    Fix Bug #3300 in the case submitted by the user: an update of the PRIMARY KEY; we do this by releasing the row lock on rows that do not match the WHERE condition; NOTE that there are several other places in MySQL code where we still have to add a call on unlock_row()
  lock0lock.c:
    test

  sql/sql_update.cc
    1.162 05/07/11 20:23:03 heikki@stripped +2 -0
    Fix Bug #3300 in the case submitted by the user: an update of the PRIMARY KEY; we do this by releasing the row lock on rows that do not match the WHERE condition; NOTE that there are several other places in MySQL code where we still have to add a call on unlock_row()

  innobase/lock/lock0lock.c
    1.64 05/07/08 17:49:16 heikki@stripped +1 -1
    test

# 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:	heikki
# Host:	hundin.mysql.fi
# Root:	/home/heikki/mysql-5.0

--- 1.161/sql/sql_update.cc	2005-07-01 07:05:36 +03:00
+++ 1.162/sql/sql_update.cc	2005-07-11 20:23:03 +03:00
@@ -337,6 +337,8 @@
 	    break;
 	  }
 	}
+	else
+      	table->file->unlock_row();
       }
       if (thd->killed && !error)
 	error= 1;				// Aborted

--- 1.63/innobase/lock/lock0lock.c	2005-07-01 20:42:11 +03:00
+++ 1.64/innobase/lock/lock0lock.c	2005-07-08 17:49:16 +03:00
@@ -5,7 +5,7 @@
 
 Created 5/7/1996 Heikki Tuuri
 *******************************************************/
-
+ 
 #include "lock0lock.h"
 
 #ifdef UNIV_NONINL