1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
msvensson@shellback.(none) 2006-10-30 13:08:57 +01:00
parent 02f56cc185
commit ac54f00f00
1 changed files with 134 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
myisam/sort.c
View File

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