diff options
| author | pem@mysql.telia.com <> | 2003-07-08 17:50:23 +0200 |
|---|---|---|
| committer | pem@mysql.telia.com <> | 2003-07-08 17:50:23 +0200 |
| commit | 9c3a7a6ba3eb62b5134577e1a42a59c0f5d9ab05 (patch) | |
| tree | 74630fcd49c30dc287ee12828be728366d6d070e /myisam/myisamdef.h | |
| parent | 3e99e79d878e9d747e91fa06ec20e971e34297d2 (diff) | |
| parent | c908b555ff3dae8511a7529f2cd8717d1f848c03 (diff) | |
| download | mariadb-git-9c3a7a6ba3eb62b5134577e1a42a59c0f5d9ab05.tar.gz | |
Merge 4.1 into 5.0 (first pass).
Diffstat (limited to 'myisam/myisamdef.h')
| -rw-r--r-- | myisam/myisamdef.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/myisamdef.h b/myisam/myisamdef.h index 83e28a42797..01e560d8154 100644 --- a/myisam/myisamdef.h +++ b/myisam/myisamdef.h @@ -695,7 +695,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); +int *killed_ptr(void *thd); 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,...)); |