← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_locking.cc

  • Committer: Henrik Ingo
  • Date: 2011-09-23 06:14:37 UTC
  • mfrom: (2425 drizzle)
  • mto: This revision was merged to the branch mainline in revision 2439.
  • Revision ID: henrik.ingo@avoinelama.fi-20110923061437-ct1wedkb9s47uy2t
Merge newest trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_locking.cc
63
63
      else
64
64
        count= --share->w_locks;
65
65
      --share->tot_locks;
66
 
      if (info->lock_type == F_WRLCK && !share->w_locks &&
67
 
          !share->delay_key_write && flush_key_blocks(share->getKeyCache(),
68
 
                                                      share->kfile,FLUSH_KEEP))
69
 
      {
70
 
        error=errno;
71
 
        mi_print_error(info->s, HA_ERR_CRASHED);
72
 
        mi_mark_crashed(info);          /* Mark that table must be checked */
73
 
      }
74
66
      if (info->opt_flag & (READ_CACHE_USED | WRITE_CACHE_USED))
75
67
      {
76
68
        if (info->rec_cache.end_io_cache())
301
293
      share->state.unique  != info->last_unique ||
302
294
      share->state.update_count != info->last_loop)
303
295
  {                                             /* Keyfile has changed */
304
 
    if (share->state.process != share->this_process)
305
 
      flush_key_blocks(share->getKeyCache(), share->kfile, FLUSH_RELEASE);
306
296
    share->last_process=share->state.process;
307
297
    info->last_unique=  share->state.unique;
308
298
    info->last_loop=    share->state.update_count;