← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_create.cc

  • Committer: Brian Aker
  • Date: 2009-03-22 21:27:04 UTC
  • mfrom: (960.2.22 mordred)
  • Revision ID: brian@tangent.org-20090322212704-ysn4mkkjg2u9kv22
Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_create.cc
17
17
 
18
18
#include "myisamdef.h"
19
19
#include <mysys/my_tree.h>
20
 
#include <mysys/queues.h>
21
20
#include <mysys/my_bit.h>
22
21
 
23
22
#include <drizzled/util/test.h>
185
184
  packed=(packed+7)/8;
186
185
  if (pack_reclength != INT32_MAX)
187
186
    pack_reclength+= reclength+packed +
188
 
      test(test_all_bits(options, HA_OPTION_CHECKSUM | HA_PACK_RECORD));
 
187
      test(test_all_bits(options,
 
188
                         uint32_t(HA_OPTION_CHECKSUM | HA_PACK_RECORD)));
189
189
  min_pack_length+=packed;
190
190
 
191
191
  if (!ci->data_file_length && ci->max_rows)
490
490
  */
491
491
  if (ci->index_file_name)
492
492
  {
493
 
    char *iext= strrchr(ci->index_file_name, '.');
 
493
    char *iext= strrchr((char *)ci->index_file_name, '.');
494
494
    int have_iext= iext && !strcmp(iext, MI_NAME_IEXT);
495
495
    if (options & HA_OPTION_TMP_TABLE)
496
496
    {
497
497
      char *path;
498
498
      /* chop off the table name, tempory tables use generated name */
499
 
      if ((path= strrchr(ci->index_file_name, FN_LIBCHAR)))
 
499
      if ((path= strrchr((char *)ci->index_file_name, FN_LIBCHAR)))
500
500
        *path= '\0';
501
501
      fn_format(filename, name, ci->index_file_name, MI_NAME_IEXT,
502
502
                MY_REPLACE_DIR | MY_UNPACK_FILENAME |
519
519
  }
520
520
  else
521
521
  {
522
 
    char *iext= strrchr(name, '.');
 
522
    char *iext= strrchr((char *)name, '.');
523
523
    int have_iext= iext && !strcmp(iext, MI_NAME_IEXT);
524
524
    fn_format(filename, name, "", MI_NAME_IEXT,
525
525
              MY_UNPACK_FILENAME | MY_RETURN_REAL_PATH |
558
558
    {
559
559
      if (ci->data_file_name)
560
560
      {
561
 
        char *dext= strrchr(ci->data_file_name, '.');
 
561
        char *dext= strrchr((char *)ci->data_file_name, '.');
562
562
        int have_dext= dext && !strcmp(dext, MI_NAME_DEXT);
563
563
 
564
564
        if (options & HA_OPTION_TMP_TABLE)
565
565
        {
566
566
          char *path;
567
567
          /* chop off the table name, tempory tables use generated name */
568
 
          if ((path= strrchr(ci->data_file_name, FN_LIBCHAR)))
 
568
          if ((path= strrchr((char *)ci->data_file_name, FN_LIBCHAR)))
569
569
            *path= '\0';
570
570
          fn_format(filename, name, ci->data_file_name, MI_NAME_DEXT,
571
571
                    MY_REPLACE_DIR | MY_UNPACK_FILENAME | MY_APPEND_EXT);