← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_extra.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_extra.cc
303
303
      share->not_flushed= false;
304
304
    }
305
305
    if (share->base.blobs)
306
 
      mi_alloc_rec_buff(info, -1, &info->rec_buff);
 
306
      mi_alloc_rec_buff(info, SIZE_MAX, &info->rec_buff);
307
307
    break;
308
308
  case HA_EXTRA_NORMAL:                         /* Theese isn't in use */
309
309
    info->quick_mode=0;
372
372
    error= end_io_cache(&info->rec_cache);
373
373
  }
374
374
  if (share->base.blobs)
375
 
    mi_alloc_rec_buff(info, -1, &info->rec_buff);
 
375
    mi_alloc_rec_buff(info, SIZE_MAX, &info->rec_buff);
376
376
#if !defined(TARGET_OS_SOLARIS)
377
377
  if (info->opt_flag & MEMMAP_USED)
378
378
    madvise((char*) share->file_map, share->state.state.data_file_length,