diff options
author | Sergei Golubchik <serg@mariadb.org> | 2022-04-28 16:59:50 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2022-04-29 17:05:12 +0200 |
commit | bc9102eb811cc39a76b04cab316bbdcceaa16026 (patch) | |
tree | a11025c053676d82bbd869cf7177d105f1d23589 /sql/item.cc | |
parent | 7215b0035435c15362bd94d169943eaad851d7dc (diff) | |
download | mariadb-git-bc9102eb811cc39a76b04cab316bbdcceaa16026.tar.gz |
cleanup: (*order->item) -> item
and minor style fixes
Diffstat (limited to 'sql/item.cc')
-rw-r--r-- | sql/item.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/item.cc b/sql/item.cc index 8b336334cc0..4c699bb974d 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -7874,8 +7874,7 @@ bool Item_ref::fix_fields(THD *thd, Item **reference) else if (!ref || ref == not_found_item) { DBUG_ASSERT(reference_trough_name != 0); - if (!(ref= resolve_ref_in_select_and_group(thd, this, - context->select_lex))) + if (!(ref= resolve_ref_in_select_and_group(thd, this, context->select_lex))) goto error; /* Some error occurred (e.g. ambiguous names). */ if (ref == not_found_item) /* This reference was not resolved. */ @@ -7888,8 +7887,7 @@ bool Item_ref::fix_fields(THD *thd, Item **reference) if (unlikely(!outer_context)) { /* The current reference cannot be resolved in this query. */ - my_error(ER_BAD_FIELD_ERROR,MYF(0), - this->full_name(), thd->where); + my_error(ER_BAD_FIELD_ERROR,MYF(0), full_name(), thd->where); goto error; } |