← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_extra.cc

Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_extra.cc
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 */
252
 
    pthread_mutex_lock(&share->intern_lock);
253
252
    if (flush_key_blocks(share->key_cache, share->kfile,
254
253
                         (function == HA_EXTRA_FORCE_REOPEN ?
255
254
                          FLUSH_RELEASE : FLUSH_IGNORE_CHANGED)))
290
289
      }
291
290
    }
292
291
    share->kfile= -1;                           /* Files aren't open anymore */
293
 
    pthread_mutex_unlock(&share->intern_lock);
294
292
#endif
295
293
    pthread_mutex_unlock(&THR_LOCK_myisam);
296
294
    break;
302
300
#endif
303
301
    if (share->not_flushed)
304
302
    {
305
 
      share->not_flushed=0;
306
 
      if (internal::my_sync(share->kfile, MYF(0)))
307
 
        error= errno;
308
 
      if (internal::my_sync(info->dfile, MYF(0)))
309
 
        error= errno;
310
 
      if (error)
311
 
      {
312
 
        share->changed=1;
313
 
        mi_print_error(info->s, HA_ERR_CRASHED);
314
 
        mi_mark_crashed(info);                  /* Fatal error found */
315
 
      }
 
303
      share->not_flushed= false;
316
304
    }
317
305
    if (share->base.blobs)
318
306
      mi_alloc_rec_buff(info, -1, &info->rec_buff);