diff options
| author | Monty <monty@mariadb.org> | 2020-03-30 20:12:02 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2020-04-19 17:33:51 +0300 |
| commit | f9f33b85be6b5006f0ecd0de7961c71d415a9d73 (patch) | |
| tree | ae547acc02c05876ccc9f54a3c7be614af206425 /sql/lock.h | |
| parent | 7866b723048d1d0f4a202d5a1e5475420b1dda64 (diff) | |
| download | mariadb-git-f9f33b85be6b5006f0ecd0de7961c71d415a9d73.tar.gz | |
Handle errors from external_unlock & mysql_unlock_tables
Other things:
- Handler errors from ha_maria::implict_commit
- Disable DBUG in safe_mutex_lock to get trace file easier to read
Diffstat (limited to 'sql/lock.h')
| -rw-r--r-- | sql/lock.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/lock.h b/sql/lock.h index e5036ea032c..0b23ddd3846 100644 --- a/sql/lock.h +++ b/sql/lock.h @@ -28,11 +28,11 @@ typedef struct st_mysql_lock MYSQL_LOCK; MYSQL_LOCK *mysql_lock_tables(THD *thd, TABLE **table, uint count, uint flags); bool mysql_lock_tables(THD *thd, MYSQL_LOCK *sql_lock, uint flags); -void mysql_unlock_tables(THD *thd, MYSQL_LOCK *sql_lock, bool free_lock); -void mysql_unlock_tables(THD *thd, MYSQL_LOCK *sql_lock); -void mysql_unlock_read_tables(THD *thd, MYSQL_LOCK *sql_lock); -void mysql_unlock_some_tables(THD *thd, TABLE **table,uint count, uint flag); -void mysql_lock_remove(THD *thd, MYSQL_LOCK *locked,TABLE *table); +int mysql_unlock_tables(THD *thd, MYSQL_LOCK *sql_lock, bool free_lock); +int mysql_unlock_tables(THD *thd, MYSQL_LOCK *sql_lock); +int mysql_unlock_read_tables(THD *thd, MYSQL_LOCK *sql_lock); +int mysql_unlock_some_tables(THD *thd, TABLE **table,uint count, uint flag); +int mysql_lock_remove(THD *thd, MYSQL_LOCK *locked,TABLE *table); bool mysql_lock_abort_for_thread(THD *thd, TABLE *table); MYSQL_LOCK *mysql_lock_merge(MYSQL_LOCK *a,MYSQL_LOCK *b); /* Lock based on name */ |