← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_extra.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_extra.cc
240
240
    }
241
241
    break;
242
242
  case HA_EXTRA_FORCE_REOPEN:
243
 
    pthread_mutex_lock(&THR_LOCK_myisam);
 
243
    THR_LOCK_myisam.lock();
244
244
    share->last_version= 0L;                    /* Impossible version */
245
 
    pthread_mutex_unlock(&THR_LOCK_myisam);
 
245
    THR_LOCK_myisam.unlock();
246
246
    break;
247
247
  case HA_EXTRA_PREPARE_FOR_DROP:
248
 
    pthread_mutex_lock(&THR_LOCK_myisam);
 
248
    THR_LOCK_myisam.lock();
249
249
    share->last_version= 0L;                    /* Impossible version */
250
250
#ifdef __WIN__REMOVE_OBSOLETE_WORKAROUND
251
251
    /* Close the isam and data files as Win32 can't drop an open table */
290
290
    }
291
291
    share->kfile= -1;                           /* Files aren't open anymore */
292
292
#endif
293
 
    pthread_mutex_unlock(&THR_LOCK_myisam);
 
293
    THR_LOCK_myisam.unlock();
294
294
    break;
295
295
  case HA_EXTRA_FLUSH:
296
296
    if (!share->temporary)