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/sql_select.cc | |
| 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/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 1f05156b96f..da30fda40f7 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -2359,10 +2359,11 @@ int JOIN::optimize_stage2() { /* Unlock all tables, except sequences, as accessing these may still - require table updates + require table updates. It's safe to ignore result code as all + tables where opened for read only. */ - mysql_unlock_some_tables(thd, table, const_tables, - GET_LOCK_SKIP_SEQUENCES); + (void) mysql_unlock_some_tables(thd, table, const_tables, + GET_LOCK_SKIP_SEQUENCES); } if (!conds && outer_join) { |