bk commit into 4.1 tree (jan:1.2212) BUG#10200

[jan.lindstrom]

Below is the list of changes that have just been committed into a local
4.1 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.2212 05/04/27 12:28:25 jan@stripped +1 -0
  Fixed a bug using mysqldump to InnoDB tables causes error (Bug #10200).

  sql/ha_innodb.cc
    1.193 05/04/27 12:28:18 jan@stripped +3 -4
    Fixed a bug using mysqldump to InnoDB tables causes error (Bug #10200).
    Lock type must be stored when sql_command = SQLCOM_LOCK_TABLES and
    lock_type = TL_READ or TL_READ_INSERT even when 
    innobase_locks_unsafe_for_binlog is set.

# 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-4.1

--- 1.192/sql/ha_innodb.cc	Tue Apr 19 08:22:57 2005
+++ 1.193/sql/ha_innodb.cc	Wed Apr 27 12:28:18 2005
@@ -5340,15 +5340,14 @@
 		    (lock_type == TL_READ || lock_type == TL_READ_NO_INSERT) &&
 		    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_DELETE_MULTI &&
+		    thd->lex->sql_command != SQLCOM_LOCK_TABLES) {
 
 			/* In case we have innobase_locks_unsafe_for_binlog
 			option set and isolation level of the transaction
 			is not set to serializable and MySQL is doing
 			INSERT INTO...SELECT without FOR UPDATE or IN
-			SHARE MODE we use consistent read for select. 
-			Similarly, in case of DELETE...SELECT and
-			UPDATE...SELECT when these are not multi table.*/
+			SHARE MODE we use consistent read for select. */
 
 			prebuilt->select_lock_type = LOCK_NONE;
 			prebuilt->stored_select_lock_type = LOCK_NONE;