diff options
| author | unknown <davi@moksha.local> | 2007-08-27 10:19:58 -0300 |
|---|---|---|
| committer | unknown <davi@moksha.local> | 2007-08-27 10:19:58 -0300 |
| commit | e7d7a2382f2e95670805bafdf40e114d42f30c58 (patch) | |
| tree | 5771cd9fb43a6f45a4fe36e3301902abb4186989 /sql/lock.cc | |
| parent | 6e96eeea5d867d29d0ce320533e999ff00e218c3 (diff) | |
| parent | 369a5f1cdcd569a02de4a12d64faebc33e9128f0 (diff) | |
| download | mariadb-git-e7d7a2382f2e95670805bafdf40e114d42f30c58.tar.gz | |
Merge moksha.local:/Users/davi/mysql/push/bugs/25164-5.0
into moksha.local:/Users/davi/mysql/push/bugs/25164-5.1
sql/lock.cc:
Auto merged
mysql-test/include/deadlock.inc:
Auto merged
mysql-test/r/deadlock_innodb.result:
Auto merged
Diffstat (limited to 'sql/lock.cc')
| -rw-r--r-- | sql/lock.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/lock.cc b/sql/lock.cc index d9e9dd31f81..29a07858bc1 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -276,6 +276,8 @@ MYSQL_LOCK *mysql_lock_tables(THD *thd, TABLE **tables, uint count, thd->lock_id)]; if (rc > 1) /* a timeout or a deadlock */ { + if (sql_lock->table_count) + VOID(unlock_external(thd, sql_lock->table, sql_lock->table_count)); my_error(rc, MYF(0)); my_free((uchar*) sql_lock,MYF(0)); sql_lock= 0; |