← Back to branch summary

~mordred/drizzle/codestyle

« back to all changes in this revision

Viewing changes to storage/myisam/mi_locking.c

  • Committer: Monty
  • Date: 2008-10-02 05:41:33 UTC
  • mfrom: (398.1.10 codestyle)
  • Revision ID: mordred@scylla.inaugust.com-20081002054133-tyxv5bmqpazfaqqi
Merged up to 408 of stdint-includes-fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_locking.c
160
160
          break;
161
161
        }
162
162
      }
163
 
      VOID(_mi_test_if_changed(info));
 
163
      _mi_test_if_changed(info);
164
164
      share->r_locks++;
165
165
      share->tot_locks++;
166
166
      info->lock_type=lock_type;
194
194
          }
195
195
        }
196
196
      }
197
 
      VOID(_mi_test_if_changed(info));
 
197
      _mi_test_if_changed(info);
198
198
        
199
199
      info->lock_type=lock_type;
200
200
      info->invalidator=info->s->invalidator;
356
356
      }
357
357
    }
358
358
    if (check_keybuffer)
359
 
      VOID(_mi_test_if_changed(info));
 
359
      _mi_test_if_changed(info);
360
360
    info->invalidator=info->s->invalidator;
361
361
  }
362
362
  else if (lock_type == F_WRLCK && info->lock_type == F_RDLCK)
416
416
      share->state.update_count != info->last_loop)
417
417
  {                                             /* Keyfile has changed */
418
418
    if (share->state.process != share->this_process)
419
 
      VOID(flush_key_blocks(share->key_cache, share->kfile, FLUSH_RELEASE));
 
419
      flush_key_blocks(share->key_cache, share->kfile, FLUSH_RELEASE);
420
420
    share->last_process=share->state.process;
421
421
    info->last_unique=  share->state.unique;
422
422
    info->last_loop=    share->state.update_count;