after-merge fixes for 64bit

storage/maria/ma_test1.c:
  typo (?) fixed

storage/maria/ma_test1.c

@@ -588,7 +588,7 @@ static void create_record(uchar *record,uint rownr)
     sprintf((char*) pos+pack_length, "... row: %d", rownr);
     tmp= strlen((char*) pos+pack_length);
     if (pack_length == 1)
-      pos= (uchar) tmp;
+      *pos= (uchar) tmp;
     else
       int2store(pos,tmp);
   }

storage/maria/maria_def.h

@@ -281,8 +281,8 @@ typedef struct st_maria_share
   my_bool (*compare_unique)(struct st_maria_info *, MARIA_UNIQUEDEF *,
                             const uchar *record, MARIA_RECORD_POS pos);
   /* Mapings to read/write the data file */
-  uint (*file_read)(MARIA_HA *, uchar *, size_t, my_off_t, myf);
-  uint (*file_write)(MARIA_HA *, const uchar *, size_t, my_off_t, myf);
+  size_t (*file_read)(MARIA_HA *, uchar *, size_t, my_off_t, myf);
+  size_t (*file_write)(MARIA_HA *, const uchar *, size_t, my_off_t, myf);
   invalidator_by_filename invalidator;	/* query cache invalidator */
   ulong this_process;			/* processid */
   ulong last_process;			/* For table-change-check */

storage/myisam/myisamdef.h

@@ -185,8 +185,8 @@ typedef struct st_mi_isam_share
     ha_checksum(*calc_checksum) (struct st_myisam_info *, const uchar*);
   int(*compare_unique) (struct st_myisam_info *, MI_UNIQUEDEF *,
                         const uchar *record, my_off_t pos);
-    uint(*file_read) (MI_INFO *, uchar *, size_t, my_off_t, myf);
-    uint(*file_write) (MI_INFO *, const uchar *, size_t, my_off_t, myf);
+    size_t (*file_read) (MI_INFO *, uchar *, size_t, my_off_t, myf);
+    size_t (*file_write) (MI_INFO *, const uchar *, size_t, my_off_t, myf);
   invalidator_by_filename invalidator;  /* query cache invalidator */
   ulong this_process;                   /* processid */
   ulong last_process;                   /* For table-change-check */
@@ -664,13 +664,13 @@ extern void _mi_unmap_file(MI_INFO *info);
 extern uint save_pack_length(uint version, uchar *block_buff, ulong length);
 extern uint calc_pack_length(uint version, ulong length);
 extern size_t mi_mmap_pread(MI_INFO *info, uchar *Buffer,
-                            uint Count, my_off_t offset, myf MyFlags);
+                            size_t Count, my_off_t offset, myf MyFlags);
 extern size_t mi_mmap_pwrite(MI_INFO *info, const uchar *Buffer,
-                             uint Count, my_off_t offset, myf MyFlags);
+                             size_t Count, my_off_t offset, myf MyFlags);
 extern size_t mi_nommap_pread(MI_INFO *info, uchar *Buffer,
-                              uint Count, my_off_t offset, myf MyFlags);
+                              size_t Count, my_off_t offset, myf MyFlags);
 extern size_t mi_nommap_pwrite(MI_INFO *info, const uchar *Buffer,
-                               uint Count, my_off_t offset, myf MyFlags);
+                               size_t Count, my_off_t offset, myf MyFlags);
 
 uint mi_state_info_write(File file, MI_STATE_INFO *state, uint pWrite);
 uchar *mi_state_info_read(uchar *ptr, MI_STATE_INFO *state);