~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/myisamlog.c

Merged build changes from Antony.

Show diffs side-by-side

added added

removed removed

Lines of Context:
20
20
#endif
21
21
 
22
22
#include "myisamdef.h"
23
 
#include <my_tree.h>
 
23
#include <mysys/my_tree.h>
24
24
#include <stdarg.h>
25
25
#ifdef HAVE_GETRUSAGE
26
26
#include <sys/resource.h>
244
244
        /* Fall through */
245
245
      case 'I':
246
246
      case '?':
247
 
#include <help_start.h>
248
247
        printf("%s  Ver 1.4 for %s at %s\n",my_progname,SYSTEM_TYPE,
249
248
               MACHINE_TYPE);
250
249
        puts("By Monty, for your professional use\n");
265
264
        puts("If a recover is done all writes and all possibly updates and deletes is done\nand errors are only counted.");
266
265
        puts("If one gives table names as arguments only these tables will be updated\n");
267
266
        help=1;
268
 
#include <help_end.h>
269
267
        break;
270
268
      default:
271
269
        printf("illegal option: \"-%c\"\n",*pos);
323
321
  }
324
322
 
325
323
  init_io_cache(&cache,file,0,READ_CACHE,start_offset,0,MYF(0));
326
 
  bzero((uchar*) com_count,sizeof(com_count));
 
324
  memset((uchar*) com_count, 0, sizeof(com_count));
327
325
  init_tree(&tree,0,0,sizeof(file_info),(qsort_cmp2) file_info_compare,1,
328
326
            (tree_element_free) file_info_free, NULL);
329
327
  VOID(init_key_cache(dflt_key_cache,KEY_CACHE_BLOCK_SIZE,KEY_CACHE_SIZE,
615
613
    case MI_LOG_LOCK:
616
614
      if (my_b_read(&cache,(uchar*) head,sizeof(lock_command)))
617
615
        goto err;
618
 
      memcpy_fixed(&lock_command,head,sizeof(lock_command));
 
616
      memcpy(&lock_command,head,sizeof(lock_command));
619
617
      if (verbose && !record_pos_file &&
620
618
          (!table_names[0] || (curr_file_info && curr_file_info->used)))
621
619
        printf_log("%s: %s(%d) -> %d\n",FILENAME(curr_file_info),
722
720
       blob != end ;
723
721
       blob++)
724
722
  {
725
 
    memcpy_fixed(record+blob->offset+blob->pack_length,&pos,sizeof(char*));
 
723
    memcpy(record+blob->offset+blob->pack_length,&pos,sizeof(char*));
726
724
    pos+=_mi_calc_blob_length(blob->pack_length,record+blob->offset);
727
725
  }
728
726
}