1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql.com:/home/svoj/devel/mysql/BUG28574/mysql-4.1-engines

Browse Source 
into  mysql.com:/home/svoj/devel/mysql/BUG28574/mysql-5.0-engines


sql/lock.cc:
  SCCS merged
This commit is contained in:
unknown 2007-06-01 13:54:31 +05:00
commit 12d55a8cc6
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sql/lock.cc
View File

@ -178,6 +178,13 @@ MYSQL_LOCK *mysql_lock_tables(THD *thd, TABLE **tables, uint count,
} }
else if (rc == 1) /* aborted */ 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 thd->some_tables_deleted=1; // Try again
sql_lock->lock_count= 0; // Locks are already freed sql_lock->lock_count= 0; // Locks are already freed
} }