diff options
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/myisamchk.c | 6 | ||||
| -rw-r--r-- | myisam/myisamdef.h | 2 | ||||
| -rw-r--r-- | myisam/sort.c | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c index c89abca9cad..fe285198641 100644 --- a/myisam/myisamchk.c +++ b/myisam/myisamchk.c @@ -1697,11 +1697,11 @@ err: sorting */ -static my_bool not_killed= 0; +static int not_killed= 0; -volatile my_bool *killed_ptr(MI_CHECK *param __attribute__((unused))) +volatile int *killed_ptr(MI_CHECK *param __attribute__((unused))) { - return ¬_killed; /* always NULL */ + return ¬_killed; /* always NULL */ } /* print warnings and errors */ diff --git a/myisam/myisamdef.h b/myisam/myisamdef.h index 736ce3f3869..12ce112dbe0 100644 --- a/myisam/myisamdef.h +++ b/myisam/myisamdef.h @@ -711,7 +711,7 @@ int mi_open_keyfile(MYISAM_SHARE *share); void mi_setup_functions(register MYISAM_SHARE *share); /* Functions needed by mi_check */ -volatile my_bool *killed_ptr(MI_CHECK *param); +volatile int *killed_ptr(MI_CHECK *param); void mi_check_print_error _VARARGS((MI_CHECK *param, const char *fmt,...)); void mi_check_print_warning _VARARGS((MI_CHECK *param, const char *fmt,...)); void mi_check_print_info _VARARGS((MI_CHECK *param, const char *fmt,...)); diff --git a/myisam/sort.c b/myisam/sort.c index 3dc066e877c..5537ba55c7d 100644 --- a/myisam/sort.c +++ b/myisam/sort.c @@ -854,7 +854,8 @@ merge_buffers(MI_SORT_PARAM *info, uint keys, IO_CACHE *from_file, uchar *strpos; BUFFPEK *buffpek,**refpek; QUEUE queue; - volatile my_bool *killed= killed_ptr(info->sort_info->param); + volatile int *killed= killed_ptr(info->sort_info->param); + DBUG_ENTER("merge_buffers"); count=error=0; |