← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_open.cc

  • Committer: Brian Aker
  • Date: 2010-08-11 16:49:34 UTC
  • mto: This revision was merged to the branch mainline in revision 1702.
  • Revision ID: brian@gaz-20100811164934-z6mqjj4o3zkwq4o6
More lock removal from myisam.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_open.cc
247
247
           &share->state.key_root,keys*sizeof(uint64_t),
248
248
           &share->state.key_del,
249
249
           (share->state.header.max_block_size_index*sizeof(uint64_t)),
250
 
           &share->key_root_lock,sizeof(pthread_rwlock_t)*keys,
251
250
           &share->mmap_lock,sizeof(pthread_rwlock_t),
252
251
           NULL))
253
252
      goto err;
390
389
    mi_setup_functions(share);
391
390
    share->is_log_table= false;
392
391
    thr_lock_init(&share->lock);
393
 
    pthread_mutex_init(&share->intern_lock,MY_MUTEX_INIT_FAST);
394
 
    for (i=0; i<keys; i++)
395
 
      pthread_rwlock_init(&share->key_root_lock[i], NULL);
396
392
    pthread_rwlock_init(&share->mmap_lock, NULL);
397
393
    if (myisam_concurrent_insert)
398
394
    {
459
455
  info.bulk_insert=0;
460
456
  info.errkey= -1;
461
457
  info.page_changed=1;
462
 
  pthread_mutex_lock(&share->intern_lock);
463
458
  info.read_record=share->read_record;
464
459
  share->reopen++;
465
460
  share->write_flag=MYF(MY_NABP | MY_WAIT_IF_FULL);
489
484
 
490
485
  share->delay_key_write= 1;
491
486
  info.state= &share->state.state;      /* Change global values by default */
492
 
  pthread_mutex_unlock(&share->intern_lock);
493
487
 
494
488
  /* Allocate buffer for one record */
495
489