← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/myisamchk.c

Giant merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/myisamchk.c
15
15
 
16
16
/* Describe, check and repair of MyISAM tables */
17
17
 
18
 
#include <my_global.h>
 
18
#include <drizzled/global.h>
19
19
 
20
 
#include <m_ctype.h>
 
20
#include <mystrings/m_ctype.h>
21
21
#include <stdarg.h>
22
 
#include <my_getopt.h>
23
 
#include <my_bit.h>
 
22
#include <mysys/my_getopt.h>
 
23
#include <mysys/my_bit.h>
24
24
#include <myisam.h>
25
 
#include <m_string.h>
 
25
#include <mystrings/m_string.h>
26
26
#ifdef HAVE_SYS_VADVICE_H
27
27
#include <sys/vadvise.h>
28
28
#endif
1412
1412
  SORT_INFO sort_info;
1413
1413
  MI_SORT_PARAM sort_param;
1414
1414
 
1415
 
  bzero((char*)&sort_info,sizeof(sort_info));
1416
 
  bzero((char*)&sort_param,sizeof(sort_param));
 
1415
  memset((char*)&sort_info, 0, sizeof(sort_info));
 
1416
  memset((char*)&sort_param, 0, sizeof(sort_param));
1417
1417
  sort_param.sort_info=&sort_info;
1418
1418
  sort_info.param=param;
1419
1419
  keyinfo= &share->keyinfo[sort_key];
1646
1646
      goto err;
1647
1647
  }
1648
1648
  /* Clear end of block to get better compression if the table is backuped */
1649
 
  bzero((uchar*) buff+used_length,keyinfo->block_length-used_length);
 
1649
  memset((uchar*) buff+used_length, 0, keyinfo->block_length-used_length);
1650
1650
  if (my_pwrite(info->s->kfile,(uchar*) buff,(uint) keyinfo->block_length,
1651
1651
                page,param->myf_rw))
1652
1652
  {