← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_extra.c

Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_extra.c
52
52
    if (info->opt_flag & READ_CACHE_USED)
53
53
    {
54
54
      reinit_io_cache(&info->rec_cache,READ_CACHE,0,
55
 
                      (pbool) (info->lock_type != F_UNLCK),
56
 
                      (pbool) test(info->update & HA_STATE_ROW_CHANGED)
 
55
                      (bool) (info->lock_type != F_UNLCK),
 
56
                      (bool) test(info->update & HA_STATE_ROW_CHANGED)
57
57
                      );
58
58
    }
59
59
    info->update= ((info->update & HA_STATE_CHANGED) | HA_STATE_NEXT_FOUND |
99
99
      if (!(init_io_cache(&info->rec_cache,info->dfile,
100
100
                         (uint) min(info->state->data_file_length+1,
101
101
                                    cache_size),
102
 
                          READ_CACHE,0L,(pbool) (info->lock_type != F_UNLCK),
 
102
                          READ_CACHE,0L,(bool) (info->lock_type != F_UNLCK),
103
103
                          MYF(share->write_flag & MY_WAIT_IF_FULL))))
104
104
      {
105
105
        info->opt_flag|=READ_CACHE_USED;
113
113
    if (info->opt_flag & READ_CACHE_USED)
114
114
    {
115
115
      reinit_io_cache(&info->rec_cache,READ_CACHE,info->nextpos,
116
 
                      (pbool) (info->lock_type != F_UNLCK),
117
 
                      (pbool) test(info->update & HA_STATE_ROW_CHANGED));
 
116
                      (bool) (info->lock_type != F_UNLCK),
 
117
                      (bool) test(info->update & HA_STATE_ROW_CHANGED));
118
118
      info->update&= ~HA_STATE_ROW_CHANGED;
119
119
      if (share->concurrent_insert)
120
120
        info->rec_cache.end_of_file=info->state->data_file_length;
134
134
        !share->state.header.uniques)
135
135
      if (!(init_io_cache(&info->rec_cache,info->dfile, cache_size,
136
136
                         WRITE_CACHE,info->state->data_file_length,
137
 
                          (pbool) (info->lock_type != F_UNLCK),
 
137
                          (bool) (info->lock_type != F_UNLCK),
138
138
                          MYF(share->write_flag & MY_WAIT_IF_FULL))))
139
139
      {
140
140
        info->opt_flag|=WRITE_CACHE_USED;
370
370
    pthread_mutex_unlock(&share->intern_lock);
371
371
#endif
372
372
    break;
373
 
  case HA_EXTRA_MARK_AS_LOG_TABLE:
374
 
    pthread_mutex_lock(&share->intern_lock);
375
 
    share->is_log_table= true;
376
 
    pthread_mutex_unlock(&share->intern_lock);
377
 
    break;
378
373
  case HA_EXTRA_KEY_CACHE:
379
374
  case HA_EXTRA_NO_KEY_CACHE:
380
375
  default: