bk commit into 5.0 tree (jan:1.1924) BUG#10746

[jan.lindstrom]

Below is the list of changes that have just been committed into a local
5.0 repository of jan. When jan 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.1924 05/05/27 09:46:40 jan@stripped +1 -0
  Fixed a bug Error: stored_select_lock_type is 0 inside ::start_stmt()! (Bug# 10746).

  sql/ha_innodb.cc
    1.211 05/05/27 09:46:32 jan@stripped +2 -1
    Fixed a bug Error: stored_select_lock_type is 0 inside ::start_stmt()! (Bug# 10746).

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

--- 1.210/sql/ha_innodb.cc	Sat May 21 18:12:28 2005
+++ 1.211/sql/ha_innodb.cc	Fri May 27 09:46:32 2005
@@ -6446,7 +6446,8 @@
 		    thd->lex->sql_command != SQLCOM_SELECT &&
 		    thd->lex->sql_command != SQLCOM_UPDATE_MULTI &&
 		    thd->lex->sql_command != SQLCOM_DELETE_MULTI &&
-		    thd->lex->sql_command != SQLCOM_LOCK_TABLES) {
+		    thd->lex->sql_command != SQLCOM_LOCK_TABLES &&
+		    thd->lex->sql_command != SQLCOM_CALL) {
 
 			/* In case we have innobase_locks_unsafe_for_binlog
 			option set and isolation level of the transaction