bk commit into 4.1 tree (iggy:1.2541)

[Ignacio Galarza]

Below is the list of changes that have just been committed into a local
4.1 repository of iggy. When iggy 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, 2006-11-02 21:03:41-05:00, iggy@stripped +1 -0
  Fix compile failure.

  myisam/sort.c@stripped, 2006-11-02 21:03:39-05:00, iggy@stripped +2 -4
    Moved DBUG_PRINT statement to declaration section.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	iggy
# Host:	rolltop.ignatz42.dyndns.org
# Root:	/mnt/storeage/mysql-4.1-release

--- 1.49/myisam/sort.c	2006-11-02 21:03:48 -05:00
+++ 1.50/myisam/sort.c	2006-11-02 21:03:48 -05:00
@@ -315,6 +315,7 @@ pthread_handler_decl(thr_find_all_keys,a
   uint memavl,old_memavl,keys,sort_length;
   uint idx, maxbuffer;
   uchar **sort_keys=0;
+  DBUG_ENTER("thr_find_all_keys");              /* FIXME why no matching DBUG_RETURN ? */
 
   LINT_INIT(keys);
 
@@ -323,10 +324,7 @@ pthread_handler_decl(thr_find_all_keys,a
   if (my_thread_init())
     goto err;
 
-  { /* Expands to declaration, create new block */
-    DBUG_ENTER("thr_find_all_keys"); /* FIXME why no matching DBUG_RETURN ? */
-    DBUG_PRINT("enter", ("master: %d", sort_param->master));
-  }
+  DBUG_PRINT("enter", ("master: %d", sort_param->master));
 
   if (sort_param->sort_info->got_error)
     goto err;