diff options
| author | unknown <jani@labbari.dsl.inet.fi> | 2007-07-07 18:03:07 +0300 |
|---|---|---|
| committer | unknown <jani@labbari.dsl.inet.fi> | 2007-07-07 18:03:07 +0300 |
| commit | 1ea806b1748c4ffc0904021d7d1e938fe837d73e (patch) | |
| tree | 66e86ba43432e208ac5184873ea51fbe95cc8c60 /sql/lock.cc | |
| parent | 6ed46be70e0c1886231729458b94fb3321ac1a31 (diff) | |
| parent | 23d10db8a3fd1830afbca1e0ab374799cc715aaa (diff) | |
| download | mariadb-git-1ea806b1748c4ffc0904021d7d1e938fe837d73e.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-maria
into labbari.dsl.inet.fi:/home/my/bk/mysql-maria.prod
mysys/thr_lock.c:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
storage/csv/ha_tina.h:
Auto merged
storage/maria/ma_blockrec.c:
Auto merged
storage/maria/ma_check.c:
Auto merged
storage/maria/ma_loghandler.c:
Auto merged
storage/maria/trnman.c:
Auto merged
storage/myisam/mi_locking.c:
Auto merged
sql/lock.cc:
SCCS merged
Diffstat (limited to 'sql/lock.cc')
| -rw-r--r-- | sql/lock.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/lock.cc b/sql/lock.cc index 50922a682a2..e129da27005 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -289,10 +289,10 @@ static int lock_external(THD *thd, TABLE **tables, uint count) void mysql_unlock_tables(THD *thd, MYSQL_LOCK *sql_lock) { DBUG_ENTER("mysql_unlock_tables"); - if (sql_lock->lock_count) - thr_multi_unlock(sql_lock->locks,sql_lock->lock_count); if (sql_lock->table_count) VOID(unlock_external(thd,sql_lock->table,sql_lock->table_count)); + if (sql_lock->lock_count) + thr_multi_unlock(sql_lock->locks,sql_lock->lock_count); my_free((uchar*) sql_lock,MYF(0)); DBUG_VOID_RETURN; } |