bk commit into 5.0 tree (gkodinov:1.2542)

[kgeorge]

Below is the list of changes that have just been committed into a local
5.0 repository of kgeorge. When kgeorge does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-10-14 11:28:43+03:00, gkodinov@stripped +1 -0
  item_sum.cc:
    Fixed dbug macros usage errors

  sql/item_sum.cc@stripped, 2007-10-14 11:28:11+03:00, gkodinov@stripped +3 -3
    Fixed dbug macros usage errors

diff -Nrup a/sql/item_sum.cc b/sql/item_sum.cc
--- a/sql/item_sum.cc	2007-10-08 12:57:41 +03:00
+++ b/sql/item_sum.cc	2007-10-14 11:28:11 +03:00
@@ -907,7 +907,7 @@ bool Item_sum_distinct::setup(THD *thd)
   DBUG_ENTER("Item_sum_distinct::setup");
   /* It's legal to call setup() more than once when in a subquery */
   if (tree)
-    return FALSE;
+    DBUG_RETURN(FALSE);
 
   /*
     Virtual table and the tree are created anew on each re-execution of
@@ -915,7 +915,7 @@ bool Item_sum_distinct::setup(THD *thd)
     mem_root.
   */
   if (field_list.push_back(&field_def))
-    return TRUE;
+    DBUG_RETURN(TRUE);
 
   null_value= maybe_null= 1;
   quick_group= 0;
@@ -927,7 +927,7 @@ bool Item_sum_distinct::setup(THD *thd)
                                args[0]->unsigned_flag);
 
   if (! (table= create_virtual_tmp_table(thd, field_list)))
-    return TRUE;
+    DBUG_RETURN(TRUE);
 
   /* XXX: check that the case of CHAR(0) works OK */
   tree_key_length= table->s->reclength - table->s->null_bytes;