From: Date: February 20 2006 6:04pm
Subject: bk commit into 5.0 tree (ingo:1.2037) BUG#5390
List-Archive: http://lists.mysql.com/commits/2925
X-Bug: 5390
Message-Id: <E1FBET1-0007xp-Rv@chilla.local>

Below is the list of changes that have just been committed into a local
5.0 repository of mydev. When mydev 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.2037 06/02/20 18:04:50 ingo@stripped +1 -0
  BUG#5390 - problems with merge tables
  Fix for merge from 4.1.

  sql/lock.cc
    1.85 06/02/20 18:04:45 ingo@stripped +0 -2
    BUG#5390 - problems with merge tables
    Fix for merge from 4.1.

# 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:	ingo
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.0-bug5390

--- 1.84/sql/lock.cc	2006-02-20 15:30:11 +01:00
+++ 1.85/sql/lock.cc	2006-02-20 18:04:45 +01:00
@@ -159,8 +159,6 @@
     memcpy(sql_lock->locks + sql_lock->lock_count, sql_lock->locks,
            sql_lock->lock_count * sizeof(*sql_lock->locks));
     /* Lock on the copied half of the lock data array. */
-    if (thr_multi_lock(sql_lock->locks + sql_lock->lock_count,
-                       sql_lock->lock_count))
     rc= thr_lock_errno_to_mysql[(int) thr_multi_lock(sql_lock->locks +
                                                      sql_lock->lock_count,
                                                      sql_lock->lock_count,