Add an extra block to avoid that DBUG_ENTER declare variables after code

myisam/sort.c

@@ -322,6 +322,9 @@ pthread_handler_t thr_find_all_keys(void *arg)
 
   if (my_thread_init())
     goto err;
+
+
+  { /* Add extra block since DBUG_ENTER declare variables */
     DBUG_ENTER("thr_find_all_keys");
     DBUG_PRINT("enter", ("master: %d", sort_param->master));
     if (sort_param->sort_info->got_error)
@@ -361,7 +364,7 @@ pthread_handler_t thr_find_all_keys(void *arg)
         uint skr;
         do
         {
-        skr=maxbuffer;
+          skr= maxbuffer;
           if (memavl < sizeof(BUFFPEK)*maxbuffer ||
               (keys=(memavl-sizeof(BUFFPEK)*maxbuffer)/
                (sort_length+sizeof(char*))) <= 1 ||
@@ -388,13 +391,15 @@ pthread_handler_t thr_find_all_keys(void *arg)
         else
           break;
       }
-    old_memavl=memavl;
-    if ((memavl=memavl/4*3) < MIN_SORT_MEMORY && old_memavl > MIN_SORT_MEMORY)
-      memavl=MIN_SORT_MEMORY;
+      old_memavl= memavl;
+      if ((memavl= memavl/4*3) < MIN_SORT_MEMORY &&
+          old_memavl > MIN_SORT_MEMORY)
+        memavl= MIN_SORT_MEMORY;
     }
     if (memavl < MIN_SORT_MEMORY)
     {
-    mi_check_print_error(sort_param->sort_info->param, "Sort buffer too small");
+      mi_check_print_error(sort_param->sort_info->param,
+                           "Sort buffer too small");
       goto err; /* purecov: tested */
     }
 
@@ -403,8 +408,8 @@ pthread_handler_t thr_find_all_keys(void *arg)
              sort_param->key + 1, keys);
     sort_param->sort_keys= sort_keys;
 
-  idx=error=0;
-  sort_keys[0]=(uchar*) (sort_keys+keys);
+    idx= error= 0;
+    sort_keys[0]= (uchar*) (sort_keys+keys);
 
     DBUG_PRINT("info", ("reading keys"));
     while (!(error= sort_param->sort_info->got_error) &&
@@ -424,9 +429,9 @@ pthread_handler_t thr_find_all_keys(void *arg)
                                    (BUFFPEK*) alloc_dynamic(&sort_param->buffpek),
                                    &sort_param->tempfile))
           goto err;
-      sort_keys[0]=(uchar*) (sort_keys+keys);
+        sort_keys[0]= (uchar*) (sort_keys+keys);
         memcpy(sort_keys[0], sort_keys[idx - 1], (size_t) sort_param->key_length);
-      idx=1;
+        idx= 1;
       }
       sort_keys[idx]= sort_keys[idx - 1] + sort_param->key_length;
     }
@@ -475,6 +480,7 @@ pthread_handler_t thr_find_all_keys(void *arg)
     pthread_mutex_unlock(&sort_param->sort_info->mutex);
 
     DBUG_PRINT("exit", ("======== ending thread ========"));
+  }
   my_thread_end();
   return NULL;
 }