← Back to branch summary

~clint-fewbar/drizzle/regex-policy-cache-limiter

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_extra.cc

  • Committer: Clint Byrum
  • Date: 2012-03-15 18:05:43 UTC
  • mfrom: (2224.1.302 workspace)
  • Revision ID: clint@ubuntu.com-20120315180543-9jxxm4q10k3np2ws
merging with latest trunk

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=flush_io_cache(&info->rec_cache)))
 
153
      if ((error= info->rec_cache.flush()))
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
 
    }
258
249
    if (info->opt_flag & (READ_CACHE_USED | WRITE_CACHE_USED))
259
250
    {
260
251
      info->opt_flag&= ~(READ_CACHE_USED | WRITE_CACHE_USED);
290
281
    THR_LOCK_myisam.unlock();
291
282
    break;
292
283
  case HA_EXTRA_FLUSH:
293
 
    if (!share->temporary)
294
 
      flush_key_blocks(share->getKeyCache(), share->kfile, FLUSH_KEEP);
295
284
#ifdef HAVE_PWRITE
296
285
    _mi_decrement_open_count(info);
297
286
#endif