diff options
| author | Jan Lindström <jplindst@mariadb.org> | 2013-09-09 10:38:58 +0300 |
|---|---|---|
| committer | Jan Lindström <jplindst@mariadb.org> | 2013-09-09 10:38:58 +0300 |
| commit | 9c85ced30dc4f6d28b4fe7ad1b73ca76f3c43a44 (patch) | |
| tree | 07be8bddba2953d42b8f16d637bdcea505eb2513 /sql/lock.cc | |
| parent | 0880db56407c8eb2d8cd7804471ee2fd5662d150 (diff) | |
| download | mariadb-git-9c85ced30dc4f6d28b4fe7ad1b73ca76f3c43a44.tar.gz | |
Merge fix.
Diffstat (limited to 'sql/lock.cc')
| -rw-r--r-- | sql/lock.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sql/lock.cc b/sql/lock.cc index 99a53ebfe3b..62540bcb55a 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -320,7 +320,8 @@ bool mysql_lock_tables(THD *thd, MYSQL_LOCK *sql_lock, uint flags) sql_lock->lock_count * sizeof(*sql_lock->locks)); #ifdef WITH_WSREP thd->lock_info.in_lock_tables= thd->in_lock_tables; -#endif /* Lock on the copied half of the lock data array. */ +#endif + /* Lock on the copied half of the lock data array. */ rc= thr_lock_errno_to_mysql[(int) thr_multi_lock(sql_lock->locks + sql_lock->lock_count, @@ -330,6 +331,12 @@ bool mysql_lock_tables(THD *thd, MYSQL_LOCK *sql_lock, uint flags) (void) unlock_external(thd, sql_lock->table, sql_lock->table_count); end: +#ifdef WITH_WSREP + thd_proc_info(thd, "mysql_lock_tables(): unlocking tables II"); +#else /* WITH_WSREP */ + thd_proc_info(thd, 0); +#endif /* WITH_WSREP */ + if (thd->killed) { thd->send_kill_message(); |