Fixes for OS2.

Fix bug in isamlog
Add argument types to function declarations.

1 files changed, 8 insertions, 5 deletions

diff --git a/myisam/sort.c b/myisam/sort.c
index e6c7d61e39a..39874d05640 100644
--- a/myisam/sort.c
+++ b/myisam/sort.c
@@ -28,6 +28,9 @@
 #include <queues.h>
 
 	/* static variabels */
+#undef MIN_SORT_MEMORY
+#undef MYF_RW
+#undef DISK_BUFFER_SIZE
 
 #define MERGEBUFF 15
 #define MERGEBUFF2 31
@@ -36,10 +39,10 @@
 #define DISK_BUFFER_SIZE (IO_SIZE*16)
 
 typedef struct st_buffpek {
-  my_off_t file_pos;			/* position to buffer */
-  ha_rows count;			/* keys in buffer */
-  uchar *base,*key;			/* Pekare inom sort_key - indexdel */
-  uint mem_count;			/* keys left in memory */
+  my_off_t file_pos;			/* Where we are in the sort file */
+  ha_rows count;			/* Number of rows in table */
+  uchar *base,*key;			/* Key pointers */
+  uint mem_count;			/* numbers of keys in memory */
   uint max_keys;			/* Max keys in buffert */
 } BUFFPEK;
 
@@ -361,7 +364,7 @@ merge_buffers(MI_SORT_PARAM *info, uint keys, IO_CACHE *from_file,
 						sort_length));
     if (error == -1)
       goto err; /* purecov: inspected */
-    queue_insert(&queue,(void*) buffpek);
+    queue_insert(&queue,(char*) buffpek);
   }
 
   while (queue.elements > 1)