diff options
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/myisamchk.c | 16 | ||||
| -rw-r--r-- | myisam/myisamdef.h | 2 |
2 files changed, 14 insertions, 4 deletions
diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c index ae26b90d0a2..01804303f8b 100644 --- a/myisam/myisamchk.c +++ b/myisam/myisamchk.c @@ -363,7 +363,7 @@ static void usage(void) directly with '--variable-name=value'.\n\ -t, --tmpdir=path Path for temporary files. Multiple paths can be\n\ specified, separated by " -#if defined( __WIN__) || defined(OS2) +#if defined( __WIN__) || defined(OS2) || defined(__NETWARE__) "semicolon (;)" #else "colon (:)" @@ -1685,9 +1685,19 @@ err: DBUG_RETURN(1); } /* sort_record_index */ -volatile bool *killed_ptr(MI_CHECK *param) + + +/* + Check if myisamchk was killed by a signal + This is overloaded by other programs that want to be able to abort + sorting +*/ + +static my_bool not_killed= 0; + +volatile my_bool *killed_ptr(MI_CHECK *param) { - return (bool *)(& param->thd); /* always NULL */ + return ¬_killed; /* always NULL */ } /* print warnings and errors */ diff --git a/myisam/myisamdef.h b/myisam/myisamdef.h index 1f100590049..736ce3f3869 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 bool *killed_ptr(MI_CHECK *param); +volatile my_bool *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,...)); |