diff options
| author | Nayuta Yanagisawa <nayuta.yanagisawa@hey.com> | 2022-08-23 21:58:45 +0900 |
|---|---|---|
| committer | Nayuta Yanagisawa <nayuta.yanagisawa@hey.com> | 2022-08-23 21:58:45 +0900 |
| commit | 03726a36b81b34f48125e7c4cd8448ed293e818e (patch) | |
| tree | f6cf394e5ea56d1e23971b88fb7cb703472381a5 | |
| parent | 0e8544cd73c190dc4da0a3e83eefffe70bb3f755 (diff) | |
| parent | 720fa05e5bb75149f75a07bab7e6ee278e93696a (diff) | |
| download | mariadb-git-03726a36b81b34f48125e7c4cd8448ed293e818e.tar.gz | |
Merge 10.5 into 10.6
| -rw-r--r-- | storage/spider/spd_db_conn.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/storage/spider/spd_db_conn.cc b/storage/spider/spd_db_conn.cc index 6f3adfba193..b21f7c4e1e7 100644 --- a/storage/spider/spd_db_conn.cc +++ b/storage/spider/spd_db_conn.cc @@ -9875,6 +9875,8 @@ int spider_db_open_item_ident( } else { if (!use_fields) { + if (!(field = spider->field_exchange(field))) + DBUG_RETURN(ER_SPIDER_COND_SKIP_NUM); if (str) { if ((error_num = share->dbton_share[dbton_id]-> @@ -9883,16 +9885,12 @@ int spider_db_open_item_ident( DBUG_RETURN(error_num); } } else { - if (!(field = spider->field_exchange(field))) - DBUG_RETURN(ER_SPIDER_COND_SKIP_NUM); if (str) { SPIDER_FIELD_CHAIN *field_chain = fields->get_next_field_chain(); SPIDER_FIELD_HOLDER *field_holder = field_chain->field_holder; spider = field_holder->spider; share = spider->share; - field = spider->field_exchange(field); - DBUG_ASSERT(field); if ((error_num = share->dbton_share[dbton_id]-> append_column_name_with_alias(str, field->field_index, field_holder->alias->ptr(), field_holder->alias->length()))) |