From 7c2ff3c307aed920fad9946a4cb7793d5071be6e Mon Sep 17 00:00:00 2001
From: "kent/mysqldev@suse9-x86.mysql.com" <>
Date: Fri, 3 Nov 2006 02:35:09 +0100
Subject: sort.c:   Create block around DBUG_ENTER late in function

---
 myisam/sort.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'myisam')

diff --git a/myisam/sort.c b/myisam/sort.c
index 154d50d4d39..e888ce3b5df 100644
--- a/myisam/sort.c
+++ b/myisam/sort.c
@@ -322,8 +322,12 @@ pthread_handler_decl(thr_find_all_keys,arg)
 
   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;
 
-- 
cgit v1.2.1


From 1d66d35fb3fac4412b173fd2d9a5495e248adcdf Mon Sep 17 00:00:00 2001
From: "iggy@rolltop.ignatz42.dyndns.org" <>
Date: Thu, 2 Nov 2006 21:03:41 -0500
Subject: Fix compile failure.

---
 myisam/sort.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'myisam')

diff --git a/myisam/sort.c b/myisam/sort.c
index e888ce3b5df..67b93db5145 100644
--- a/myisam/sort.c
+++ b/myisam/sort.c
@@ -315,6 +315,7 @@ pthread_handler_decl(thr_find_all_keys,arg)
   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,arg)
   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;
-- 
cgit v1.2.1