bk commit into 5.1 tree (svoj:1.2519)

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
5.1 repository of svoj. When svoj 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@stripped, 2007-06-01 15:33:48+05:00, svoj@stripped +1 -0
  Merge mysql.com:/home/svoj/devel/mysql/BUG28574/mysql-5.0-engines
  into  mysql.com:/home/svoj/devel/mysql/BUG28574/mysql-5.1-engines
  MERGE: 1.1810.2942.26

  sql/lock.cc@stripped, 2007-06-01 15:33:45+05:00, svoj@stripped +0 -0
    Auto merged
    MERGE: 1.64.1.33

# 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:	svoj
# Host:	june.mysql.com
# Root:	/home/svoj/devel/mysql/BUG28574/mysql-5.1-engines/RESYNC

--- 1.108/sql/lock.cc	2007-05-24 15:24:28 +05:00
+++ 1.109/sql/lock.cc	2007-06-01 15:33:45 +05:00
@@ -197,6 +197,13 @@ MYSQL_LOCK *mysql_lock_tables(THD *thd, 
     }
     else if (rc == 1)                           /* aborted */
     {
+      /*
+        reset_lock_data is required here. If thr_multi_lock fails it
+        resets lock type for tables, which were locked before (and
+        including) one that caused error. Lock type for other tables
+        preserved.
+      */
+      reset_lock_data(sql_lock);
       thd->some_tables_deleted=1;		// Try again
       sql_lock->lock_count= 0;                  // Locks are already freed
     }