← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/log.cc

  • Committer: Monty Taylor
  • Date: 2008-10-06 01:30:47 UTC
  • Revision ID: monty@inaugust.com-20081006013047-6m2ejc0c4peye2k9
Removed my_free(). It turns out that it had been def'd to ignore the flags passed to it in the second arg anyway. Gotta love that.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/log.cc
397
397
  assert(trx_data->empty());
398
398
  thd_set_ha_data(thd, binlog_hton, NULL);
399
399
  trx_data->~binlog_trx_data();
400
 
  my_free((uchar*)trx_data, MYF(0));
 
400
  free((uchar*)trx_data);
401
401
  return 0;
402
402
}
403
403
 
1600
1600
    need_start_event=1;
1601
1601
  if (!open_index_file(index_file_name, 0))
1602
1602
    open(save_name, log_type, 0, io_cache_type, no_auto_events, max_size, 0);
1603
 
  my_free((uchar*) save_name, MYF(0));
 
1603
  free((uchar*) save_name);
1604
1604
 
1605
1605
err:
1606
1606
  pthread_mutex_unlock(&LOCK_thread_count);
2131
2131
 
2132
2132
  open(old_name, log_type, new_name_ptr,
2133
2133
       io_cache_type, no_auto_events, max_size, 1);
2134
 
  my_free(old_name,MYF(0));
 
2134
  free(old_name);
2135
2135
 
2136
2136
end:
2137
2137
  if (need_lock)
2250
2250
      open_cached_file(&trx_data->trans_log, mysql_tmpdir,
2251
2251
                       LOG_PREFIX, binlog_cache_size, MYF(MY_WME)))
2252
2252
  {
2253
 
    my_free((uchar*)trx_data, MYF(MY_ALLOW_ZERO_PTR));
 
2253
    free((uchar*)trx_data);
2254
2254
    return(1);                      // Didn't manage to set it up
2255
2255
  }
2256
2256
  thd_set_ha_data(this, binlog_hton, trx_data);
3696
3696
      pthread_cond_destroy(&pages[i].cond);
3697
3697
    }
3698
3698
  case 3:
3699
 
    my_free((uchar*)pages, MYF(0));
 
3699
    free((uchar*)pages);
3700
3700
  case 2:
3701
3701
    my_munmap((char*)data, (size_t)file_length);
3702
3702
  case 1: