← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_open.cc

  • Committer: lbieber
  • Date: 2010-10-07 02:59:11 UTC
  • mfrom: (1818.1.2 build)
  • Revision ID: lbieber@orisndriz08-20101007025911-rz1n8q23hrwxks6v
Merge Brian - Fix a large number of warning issues on ICC. sql_string becomes 64bit
Merge Monty - clean up ICC warnings

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_open.cc
137
137
      goto err;
138
138
    }
139
139
    share->options= mi_uint2korr(share->state.header.options);
140
 
    if (share->options &
141
 
        ~(HA_OPTION_PACK_RECORD | HA_OPTION_PACK_KEYS |
142
 
          HA_OPTION_COMPRESS_RECORD | HA_OPTION_READ_ONLY_DATA |
143
 
          HA_OPTION_TEMP_COMPRESS_RECORD |
144
 
          HA_OPTION_TMP_TABLE
145
 
          ))
 
140
    static const uint64_t OLD_FILE_OPTIONS= HA_OPTION_PACK_RECORD |
 
141
            HA_OPTION_PACK_KEYS |
 
142
            HA_OPTION_COMPRESS_RECORD | HA_OPTION_READ_ONLY_DATA |
 
143
            HA_OPTION_TEMP_COMPRESS_RECORD |
 
144
            HA_OPTION_TMP_TABLE;
 
145
    if (share->options & ~OLD_FILE_OPTIONS)
146
146
    {
147
147
      errno=HA_ERR_OLD_FILE;
148
148
      goto err;
489
489
  /* Allocate buffer for one record */
490
490
 
491
491
  /* prerequisites: memset(info, 0) && info->s=share; are met. */
492
 
  if (!mi_alloc_rec_buff(&info, -1, &info.rec_buff))
 
492
  if (!mi_alloc_rec_buff(&info, SIZE_MAX, &info.rec_buff))
493
493
    goto err;
494
494
  memset(info.rec_buff, 0, mi_get_rec_buff_len(&info, info.rec_buff));
495
495
 
544
544
    unsigned char *newptr = *buf;
545
545
 
546
546
    /* to simplify initial init of info->rec_buf in mi_open and mi_extra */
547
 
    if (length == (ulong) -1)
 
547
    if (length == SIZE_MAX)
548
548
    {
549
549
      if (info->s->options & HA_OPTION_COMPRESS_RECORD)
550
550
        length= max(info->s->base.pack_reclength, info->s->max_pack_length);