← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/myisamchk.c

  • Committer: Monty Taylor
  • Date: 2008-10-13 09:29:43 UTC
  • mfrom: (509 drizzle)
  • mto: (509.1.4 codestyle)
  • mto: This revision was merged to the branch mainline in revision 511.
  • Revision ID: monty@inaugust.com-20081013092943-rwvx4a6d85b5l2dh
Merged in trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/myisamchk.c
29
29
#ifdef HAVE_SYS_MMAN_H
30
30
#include <sys/mman.h>
31
31
#endif
32
 
 
33
 
#define my_raid_create(A,B,C,D,E,F,G) my_create(A,B,C,G)
34
 
#define my_raid_delete(A,B,C) my_delete(A,B)
 
32
#include <drizzled/util/test.h>
35
33
 
36
34
#include "myisamdef.h"
37
35
 
1193
1191
             share->base.auto_key,
1194
1192
             llstr(share->state.auto_increment,llbuff));
1195
1193
    }
1196
 
    if (share->base.raid_type)
1197
 
    {
1198
 
      printf("RAID:                Type:  %u   Chunks: %u  Chunksize: %lu\n",
1199
 
             share->base.raid_type,
1200
 
             share->base.raid_chunks,
1201
 
             share->base.raid_chunksize);
1202
 
    }
1203
1194
    if (share->options & (HA_OPTION_CHECKSUM | HA_OPTION_COMPRESS_RECORD))
1204
1195
      printf("Checksum:  %23s\n",llstr(info->state->checksum,llbuff));
1205
1196
;
1464
1455
    goto err;
1465
1456
  }
1466
1457
  fn_format(param->temp_filename,name,"", MI_NAME_DEXT,2+4+32);
1467
 
  new_file=my_raid_create(fn_format(param->temp_filename,
1468
 
                                    param->temp_filename,"",
1469
 
                                    DATA_TMP_EXT,2+4),
1470
 
                          0,param->tmpfile_createflag,
1471
 
                          share->base.raid_type,
1472
 
                          share->base.raid_chunks,
1473
 
                          share->base.raid_chunksize,
1474
 
                          MYF(0));
 
1458
  new_file=my_create(fn_format(param->temp_filename,
 
1459
                               param->temp_filename,"",
 
1460
                               DATA_TMP_EXT,2+4),        
 
1461
                     0,param->tmpfile_createflag,
 
1462
                     MYF(0));
1475
1463
  if (new_file < 0)
1476
1464
  {
1477
1465
    mi_check_print_error(param,"Can't create new tempfile: '%s'",
1546
1534
  {
1547
1535
    end_io_cache(&info->rec_cache);
1548
1536
    (void) my_close(new_file,MYF(MY_WME));
1549
 
    (void) my_raid_delete(param->temp_filename, share->base.raid_chunks,
1550
 
                          MYF(MY_WME));
 
1537
    (void) my_delete(param->temp_filename, MYF(MY_WME));
1551
1538
  }
1552
1539
  if (temp_buff)
1553
1540
  {