bk commit into 4.1 tree (kent:1.2540)

[kent]

Below is the list of changes that have just been committed into a local
4.1 repository of mysqldev. When mysqldev 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-03 02:35:09+01:00, kent@stripped +1 -0
  sort.c:
    Create block around DBUG_ENTER late in function

  myisam/sort.c@stripped, 2006-11-03 02:34:47+01:00, kent@stripped +6 -2
    Create block around DBUG_ENTER late in function

# 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:	kent
# Host:	suse9-x86.mysql.com
# Root:	/data0/mydev/mysql-4.1.22-build

--- 1.48/myisam/sort.c	2006-11-03 02:35:31 +01:00
+++ 1.49/myisam/sort.c	2006-11-03 02:35:31 +01:00
@@ -322,8 +322,12 @@
 
   if (my_thread_init())
     goto err;
-  DBUG_ENTER("thr_find_all_keys");
-  DBUG_PRINT("enter", ("master: %d", sort_param->master));
+
+  { /* 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));
+  }
+
   if (sort_param->sort_info->got_error)
     goto err;