Commit 97a98ff5 authored by unknown's avatar unknown

item_sum.cc:

  Fixed dbug macros usage errors


sql/item_sum.cc:
  Fixed dbug macros usage errors
parent c9141ac5
...@@ -907,7 +907,7 @@ bool Item_sum_distinct::setup(THD *thd) ...@@ -907,7 +907,7 @@ bool Item_sum_distinct::setup(THD *thd)
DBUG_ENTER("Item_sum_distinct::setup"); DBUG_ENTER("Item_sum_distinct::setup");
/* It's legal to call setup() more than once when in a subquery */ /* It's legal to call setup() more than once when in a subquery */
if (tree) if (tree)
return FALSE; DBUG_RETURN(FALSE);
/* /*
Virtual table and the tree are created anew on each re-execution of Virtual table and the tree are created anew on each re-execution of
...@@ -915,7 +915,7 @@ bool Item_sum_distinct::setup(THD *thd) ...@@ -915,7 +915,7 @@ bool Item_sum_distinct::setup(THD *thd)
mem_root. mem_root.
*/ */
if (field_list.push_back(&field_def)) if (field_list.push_back(&field_def))
return TRUE; DBUG_RETURN(TRUE);
null_value= maybe_null= 1; null_value= maybe_null= 1;
quick_group= 0; quick_group= 0;
...@@ -927,7 +927,7 @@ bool Item_sum_distinct::setup(THD *thd) ...@@ -927,7 +927,7 @@ bool Item_sum_distinct::setup(THD *thd)
args[0]->unsigned_flag); args[0]->unsigned_flag);
if (! (table= create_virtual_tmp_table(thd, field_list))) if (! (table= create_virtual_tmp_table(thd, field_list)))
return TRUE; DBUG_RETURN(TRUE);
/* XXX: check that the case of CHAR(0) works OK */ /* XXX: check that the case of CHAR(0) works OK */
tree_key_length= table->s->reclength - table->s->null_bytes; tree_key_length= table->s->reclength - table->s->null_bytes;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment