4 files changed, 6 insertions, 5 deletions
diff --git a/myisam/mi_check.c b/myisam/mi_check.c
index cfdb696b60b..4f8fc9b981a 100644
--- a/myisam/mi_check.c
+++ b/myisam/mi_check.c
@@ -2633,7 +2633,7 @@ static int sort_get_next_record(MI_SORT_PARAM *sort_param)
   char llbuff[22],llbuff2[22];
   DBUG_ENTER("sort_get_next_record");
 
-  if (*killed_ptr(param))
+  if (*killed_ptr(param->thd))
     DBUG_RETURN(1);
 
   switch (share->data_file_type) {
diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c
index 605baa14582..5193a817a3a 100644
--- a/myisam/myisamchk.c
+++ b/myisam/myisamchk.c
@@ -1667,9 +1667,9 @@ err:
   DBUG_RETURN(1);
 } /* sort_record_index */
 
-volatile bool *killed_ptr(MI_CHECK *param)
+int *killed_ptr(void *thd)
 {
-  return (bool *)(& param->thd); /* always NULL */
+  return (int *)thd; /* always NULL */
 }
 
 	/* print warnings and errors */
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,...));
diff --git a/myisam/sort.c b/myisam/sort.c
index a41713f750f..4617dec46f4 100644
--- a/myisam/sort.c
+++ b/myisam/sort.c
@@ -848,7 +848,8 @@ merge_buffers(MI_SORT_PARAM *info, uint keys, IO_CACHE *from_file,
   uchar *strpos;
   BUFFPEK *buffpek,**refpek;
   QUEUE queue;
-  volatile bool *killed= killed_ptr(info->sort_info->param);
+  int *killed= killed_ptr(info->sort_info->param->thd);
+
   DBUG_ENTER("merge_buffers");
 
   count=error=0;