← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_extra.cc

  • Committer: Mark Atwood
  • Date: 2011-08-17 06:10:57 UTC
  • Revision ID: me@mark.atwood.name-20110817061057-7hsj5c0dc4n3grrr
link docs/ipv6_data_type.rst to TOC in docs/columntypes.rst

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_extra.cc
150
150
  case HA_EXTRA_FLUSH_CACHE:
151
151
    if (info->opt_flag & WRITE_CACHE_USED)
152
152
    {
153
 
      if ((error= info->rec_cache.flush()))
 
153
      if ((error=flush_io_cache(&info->rec_cache)))
154
154
      {
155
155
        mi_print_error(info->s, HA_ERR_CRASHED);
156
156
        mi_mark_crashed(info);                  /* Fatal error found */
246
246
    share->last_version= 0L;                    /* Impossible version */
247
247
#ifdef __WIN__REMOVE_OBSOLETE_WORKAROUND
248
248
    /* Close the isam and data files as Win32 can't drop an open table */
 
249
    if (flush_key_blocks(share->key_cache, share->kfile,
 
250
                         (function == HA_EXTRA_FORCE_REOPEN ?
 
251
                          FLUSH_RELEASE : FLUSH_IGNORE_CHANGED)))
 
252
    {
 
253
      error=errno;
 
254
      share->changed=1;
 
255
      mi_print_error(info->s, HA_ERR_CRASHED);
 
256
      mi_mark_crashed(info);                    /* Fatal error found */
 
257
    }
249
258
    if (info->opt_flag & (READ_CACHE_USED | WRITE_CACHE_USED))
250
259
    {
251
260
      info->opt_flag&= ~(READ_CACHE_USED | WRITE_CACHE_USED);
281
290
    THR_LOCK_myisam.unlock();
282
291
    break;
283
292
  case HA_EXTRA_FLUSH:
 
293
    if (!share->temporary)
 
294
      flush_key_blocks(share->getKeyCache(), share->kfile, FLUSH_KEEP);
284
295
#ifdef HAVE_PWRITE
285
296
    _mi_decrement_open_count(info);
286
297
#endif