diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2022-08-31 11:55:03 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2022-08-31 11:55:03 +0300 |
| commit | 409b8a86de45efc96377c618a99cff1301523150 (patch) | |
| tree | 0db3fdcb1c1fbce32647c966c5292fc609bd9b86 /sql/sql_base.cc | |
| parent | 65e0d0ea66180168eb6539bb11a78aafb7247bd4 (diff) | |
| download | mariadb-git-409b8a86de45efc96377c618a99cff1301523150.tar.gz | |
MDEV-25292 ha_table_exists() cleanup and improvement
Removed default values for arguments, added flags argument to specify
filename flags (FN_TO_IS_TMP, FN_FROM_IS_TMP).
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 54296af5a0b..9279e2eccde 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -2008,7 +2008,8 @@ bool open_table(THD *thd, TABLE_LIST *table_list, Open_table_context *ot_ctx) if (table_list->open_strategy == TABLE_LIST::OPEN_IF_EXISTS) { - if (!ha_table_exists(thd, &table_list->db, &table_list->table_name)) + if (!ha_table_exists(thd, &table_list->db, &table_list->table_name, + NULL, NULL, NULL, NULL, 0)) DBUG_RETURN(FALSE); } else if (table_list->open_strategy == TABLE_LIST::OPEN_STUB) @@ -4223,7 +4224,7 @@ static bool upgrade_lock_if_not_exists(THD *thd, DEBUG_SYNC(thd,"create_table_before_check_if_exists"); if (!create_info.or_replace() && ha_table_exists(thd, &create_table->db, &create_table->table_name, - NULL, NULL, &create_table->db_type)) + NULL, NULL, &create_table->db_type, NULL, 0)) { if (create_info.if_not_exists()) { |