From: Date: March 17 2006 11:32am
Subject: bk commit into 5.0 tree (kent:1.2106) BUG#18077
List-Archive: http://lists.mysql.com/commits/3920
X-Bug: 18077
Message-Id: <20060317103221.2A0B4A11910@boortz.dyndns.org>

Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent 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.2106 06/03/17 11:32:02 kent@stripped +2 -0
  configure.in:
    Changed release name to 5.0.19a
  ha_innodb.cc:
    InnoDB used table locks (not row locks) within stored functions. (Bug #18077)

  configure.in
    1.376 06/03/17 11:28:24 kent@stripped +2 -2
    Changed release name to 5.0.19a

  sql/ha_innodb.cc
    1.287 06/03/17 11:13:55 kent@stripped +2 -2
    InnoDB used table locks (not row locks) within stored functions. (Bug #18077)

# 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:	kent
# Host:	g4-2.local
# Root:	/Users/kent/mysql/bk/mysql-5.0.19a-clone

--- 1.375/configure.in	2006-02-25 16:46:25 +01:00
+++ 1.376/configure.in	2006-03-17 11:28:24 +01:00
@@ -7,7 +7,7 @@
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # remember to also change ndb version below and update version.c in ndb
-AM_INIT_AUTOMAKE(mysql, 5.0.19)
+AM_INIT_AUTOMAKE(mysql, 5.0.19a)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10
@@ -19,7 +19,7 @@
 # ndb version
 NDB_VERSION_MAJOR=5
 NDB_VERSION_MINOR=0
-NDB_VERSION_BUILD=19
+NDB_VERSION_BUILD=19a
 NDB_VERSION_STATUS=""
 
 # Set all version vars based on $VERSION. How do we do this more elegant ?

--- 1.286/sql/ha_innodb.cc	2006-01-31 19:41:42 +01:00
+++ 1.287/sql/ha_innodb.cc	2006-03-17 11:13:55 +01:00
@@ -6884,8 +6884,8 @@
 
     		if ((lock_type >= TL_WRITE_CONCURRENT_INSERT 
 		    && lock_type <= TL_WRITE)
-		    && (!thd->in_lock_tables
-			|| thd->lex->sql_command == SQLCOM_CALL)
+		    && !(thd->in_lock_tables
+                         && thd->lex->sql_command == SQLCOM_LOCK_TABLES)
 		    && !thd->tablespace_op
 		    && thd->lex->sql_command != SQLCOM_TRUNCATE
 		    && thd->lex->sql_command != SQLCOM_OPTIMIZE