← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mf_keycache.c

  • Committer: Brian Aker
  • Date: 2009-01-28 19:37:25 UTC
  • mfrom: (779.3.11 devel)
  • Revision ID: brian@tangent.org-20090128193725-pz7g7dnp2dx0863e
Merge from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mf_keycache.c
2194
2194
unsigned char *key_cache_read(KEY_CACHE *keycache,
2195
2195
                      File file, my_off_t filepos, int level,
2196
2196
                      unsigned char *buff, uint32_t length,
2197
 
                      uint32_t block_length __attribute__((unused)),
2198
 
                      int return_buffer __attribute__((unused)))
 
2197
                      uint32_t block_length,
 
2198
                      int return_buffer)
2199
2199
{
 
2200
  (void)block_length;
 
2201
  (void)return_buffer;
2200
2202
  bool locked_and_incremented= false;
2201
2203
  int error=0;
2202
2204
  unsigned char *start= buff;
2620
2622
int key_cache_write(KEY_CACHE *keycache,
2621
2623
                    File file, my_off_t filepos, int level,
2622
2624
                    unsigned char *buff, uint32_t length,
2623
 
                    uint32_t block_length  __attribute__((unused)),
 
2625
                    uint32_t block_length,
2624
2626
                    int dont_write)
2625
2627
{
 
2628
  (void)block_length;
2626
2629
  bool locked_and_incremented= false;
2627
2630
  int error=0;
2628
2631
 
3183
3186
    BLOCK_LINK *first_in_switch= NULL;
3184
3187
    BLOCK_LINK *last_in_flush;
3185
3188
    BLOCK_LINK *last_for_update;
 
3189
    BLOCK_LINK *last_in_switch;
3186
3190
    BLOCK_LINK *block, *next;
3187
3191
 
3188
3192
    if (type != FLUSH_IGNORE_CHANGED)
3424
3428
 
3425
3429
    if (! (type == FLUSH_KEEP || type == FLUSH_FORCE_WRITE))
3426
3430
    {
3427
 
      BLOCK_LINK *last_for_update= NULL;
3428
 
      BLOCK_LINK *last_in_switch= NULL;
 
3431
      last_for_update= NULL;
 
3432
      last_in_switch= NULL;
3429
3433
      uint32_t total_found= 0;
3430
3434
      uint32_t found;
3431
3435
 
3748
3752
    0 on success (always because it can't fail)
3749
3753
*/
3750
3754
 
3751
 
int reset_key_cache_counters(const char *name __attribute__((unused)),
3752
 
                             KEY_CACHE *key_cache)
 
3755
int reset_key_cache_counters(const char *name, KEY_CACHE *key_cache)
3753
3756
{
 
3757
  (void)name;
3754
3758
  if (!key_cache->key_cache_inited)
3755
3759
  {
3756
3760
    return(0);