Commit 3e7cae68 authored by unknown's avatar unknown
Browse files

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

parent c1b29d29

myisam/sort.c

+132 −126
Original line number Diff line number Diff line
@@ -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)
@@ -389,12 +392,14 @@ pthread_handler_t thr_find_all_keys(void *arg) 
          break;

      }

      old_memavl= memavl;

    if ((memavl=memavl/4*3) < MIN_SORT_MEMORY && old_memavl > MIN_SORT_MEMORY)

      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 */

    }
@@ -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;

}