diff options
| author | hf@deer.mysql.r18.ru <> | 2003-04-08 19:18:33 +0500 |
|---|---|---|
| committer | hf@deer.mysql.r18.ru <> | 2003-04-08 19:18:33 +0500 |
| commit | 0428d08606269faf5eddd5740b5f9e80abfacbe4 (patch) | |
| tree | 295ae18e0819b1fd8547ac14b570335446f7353a /myisam/sort.c | |
| parent | dcdc24b508697bf40bb4ade76eebae32d98ae41f (diff) | |
| download | mariadb-git-0428d08606269faf5eddd5740b5f9e80abfacbe4.tar.gz | |
SCRUM
two KILL versions
code trimming with headquarter's suggestions
Diffstat (limited to 'myisam/sort.c')
| -rw-r--r-- | myisam/sort.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/myisam/sort.c b/myisam/sort.c index 1913af650c0..73c5b414edf 100644 --- a/myisam/sort.c +++ b/myisam/sort.c @@ -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; } |