← Back to branch summary

~ubuntu-branches/ubuntu/saucy/drizzle/saucy

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_panic.cc

  • Committer: Package Import Robot
  • Author(s): Clint Byrum
  • Date: 2012-06-19 10:46:49 UTC
  • mfrom: (1.2.11) (2.1.16 sid)
  • Revision ID: package-import@ubuntu.com-20120619104649-9ij634mxm4x8pp4l
Tags: 1:7.1.36-stable-1ubuntu1
https://launchpad.net/bugs/987575
* Merge from Debian unstable. (LP: #987575)
  Remaining changes:
  - Added upstart script.
* debian/drizzle.upstart: dropped logger since upstart logs job
  output now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_panic.cc
48
48
      if (info->s->options & HA_OPTION_READ_ONLY_DATA)
49
49
        break;
50
50
#endif
51
 
      if (flush_key_blocks(info->s->getKeyCache(), info->s->kfile, FLUSH_RELEASE))
52
 
        error=errno;
53
51
      if (info->opt_flag & WRITE_CACHE_USED)
54
 
        if (flush_io_cache(&info->rec_cache))
 
52
        if (info->rec_cache.flush())
55
53
          error=errno;
56
54
      if (info->opt_flag & READ_CACHE_USED)
57
55
      {
58
 
        if (flush_io_cache(&info->rec_cache))
 
56
        if (info->rec_cache.flush())
59
57
          error=errno;
60
58
        info->rec_cache.reinit_io_cache(internal::READ_CACHE,0, (bool) (info->lock_type != F_UNLCK),1);
61
59
      }