← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_close.cc

  • Committer: Brian Aker
  • Date: 2010-08-13 18:47:12 UTC
  • mfrom: (1703.1.4 staging)
  • Revision ID: brian@tangent.org-20100813184712-rx8hjq33powaaqlv
Merge MyISAM changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_close.cc
30
30
  int error=0,flag;
31
31
  MYISAM_SHARE *share=info->s;
32
32
 
33
 
  pthread_mutex_lock(&THR_LOCK_myisam);
 
33
  THR_LOCK_myisam.lock();
34
34
  if (info->lock_type == F_EXTRA_LCK)
35
35
    info->lock_type=F_UNLCK;                    /* HA_EXTRA_NO_USER_CHANGE */
36
36
 
90
90
    delete info->s->in_use;
91
91
    free((unsigned char*) info->s);
92
92
  }
93
 
  pthread_mutex_unlock(&THR_LOCK_myisam);
 
93
  THR_LOCK_myisam.unlock();
94
94
 
95
95
  if (info->dfile >= 0 && internal::my_close(info->dfile,MYF(0)))
96
96
    error = errno;