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

SCRUM

Browse Source 
two KILL commands implementation (version 2)
This commit is contained in:
hf@genie.(none)
2003-03-31 13:39:46 +05:00
parent d00b3ba511
commit f8f0b70380
51 changed files with 93 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
myisam/sort.c
View File

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