diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-03 14:44:06 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-03 14:44:06 +0200 |
| commit | 57325e470615e79f674d82b2d5b09f609508fc6a (patch) | |
| tree | 7a2e84a6753a5a5592f44f96194ad7a551c4669f /sql/sql_base.cc | |
| parent | 706a7101bfacd29f4f5728034be92240e82df583 (diff) | |
| parent | c32f71af7e4b747de223bf6b44e691941f5997cf (diff) | |
| download | mariadb-git-57325e470615e79f674d82b2d5b09f609508fc6a.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 10bc6ccab6c..75427f106a4 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -1419,7 +1419,7 @@ bool wait_while_table_is_used(THD *thd, TABLE *table, FALSE); /* extra() call must come only after all instances above are closed */ if (function != HA_EXTRA_NOT_USED) - (void) table->file->extra(function); + DBUG_RETURN(table->file->extra(function)); DBUG_RETURN(FALSE); } @@ -7944,15 +7944,11 @@ bool setup_tables(THD *thd, Name_resolution_context *context, FALSE ok; In this case *map will include the chosen index TRUE error */ -bool setup_tables_and_check_access(THD *thd, - Name_resolution_context *context, +bool setup_tables_and_check_access(THD *thd, Name_resolution_context *context, List<TABLE_LIST> *from_clause, - TABLE_LIST *tables, - List<TABLE_LIST> &leaves, - bool select_insert, - ulong want_access_first, - ulong want_access, - bool full_table_list) + TABLE_LIST *tables, List<TABLE_LIST> &leaves, + bool select_insert, ulong want_access_first, + ulong want_access, bool full_table_list) { DBUG_ENTER("setup_tables_and_check_access"); |