diff options
| author | pem@mysql.com <> | 2003-11-19 15:19:46 +0100 |
|---|---|---|
| committer | pem@mysql.com <> | 2003-11-19 15:19:46 +0100 |
| commit | 28a2c6a96b0e6383ab47494dc9f67653d24a01f3 (patch) | |
| tree | e3ba11d4938f6675c5c72ee69cc88980a81ad705 /myisam/myisamdef.h | |
| parent | 8e1584d79e792545c6f726eb94655f457968aaf8 (diff) | |
| parent | c4871b240da54a5a808ee30ede7c1ec751119763 (diff) | |
| download | mariadb-git-28a2c6a96b0e6383ab47494dc9f67653d24a01f3.tar.gz | |
Merging 4.1->5.0.
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 4f1bed5d50a..20574e43ac3 100644 --- a/myisam/myisamdef.h +++ b/myisam/myisamdef.h @@ -703,7 +703,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,...)); |