diff options
| author | unknown <monty@mysql.com> | 2004-07-12 07:43:38 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-07-12 07:43:38 +0300 |
| commit | c4645f84047585b12523d8d111044bf040880bb4 (patch) | |
| tree | 10e62d45a952afd6fc7079f46435e5a5144b3dc8 /sql/ha_myisam.cc | |
| parent | 11b8987313aab1eb8d9f829731fa0dcd83bf62f5 (diff) | |
| download | mariadb-git-c4645f84047585b12523d8d111044bf040880bb4.tar.gz | |
After merge fixes
Diffstat (limited to 'sql/ha_myisam.cc')
| -rw-r--r-- | sql/ha_myisam.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc index f7e966a9d16..d3dc0bb58de 100644 --- a/sql/ha_myisam.cc +++ b/sql/ha_myisam.cc @@ -87,9 +87,10 @@ static void mi_check_print_msg(MI_CHECK *param, const char* msg_type, extern "C" { -int *killed_ptr(void *thd) +volatile int *killed_ptr(MI_CHECK *param) { - return (int*)&((THD *)thd)->killed; + /* In theory Unsafe conversion, but should be ok for now */ + return (int*) &(((THD *)(param->thd))->killed); } void mi_check_print_error(MI_CHECK *param, const char *fmt,...) |