database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

SCRUM

Browse Source 
two KILL versions
code trimming with headquarter's suggestions
This commit is contained in:
hf@deer.mysql.r18.ru
2003-04-08 19:18:33 +05:00
parent dcdc24b508
commit 0428d08606
17 changed files with 39 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
myisam/sort.c
View File

@ -844,7 +844,7 @@ merge_buffers(MI_SORT_PARAM *info, uint keys, IO_CACHE *from_file,
uchar *strpos;
BUFFPEK *buffpek,**refpek;
QUEUE queue;
void *thd= info->sort_info->param->thd;
int *killed= killed_ptr(info->sort_info->param->thd);
DBUG_ENTER("merge_buffers");
@ -876,7 +876,7 @@ merge_buffers(MI_SORT_PARAM *info, uint keys, IO_CACHE *from_file,
{
for (;;)
{
if (killed_ptr(thd))
if (*killed)
{
error=1; goto err;
}