← 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-12-04 01:59:53 UTC
  • mto: This revision was merged to the branch mainline in revision 649.
  • Revision ID: monty@inaugust.com-20081204015953-qiwwq8h6rr1mocfv
More my_malloc removal.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/log.cc
2219
2219
  if (trx_data)
2220
2220
    return(0);                             // Already set up
2221
2221
 
2222
 
  trx_data= (binlog_trx_data*) my_malloc(sizeof(binlog_trx_data), MYF(MY_ZEROFILL));
 
2222
  trx_data= (binlog_trx_data*) malloc(sizeof(binlog_trx_data));
 
2223
  memset(trx_data, 0, sizeof(binlog_trx_data));
2223
2224
  if (!trx_data ||
2224
2225
      open_cached_file(&trx_data->trans_log, drizzle_tmpdir,
2225
2226
                       LOG_PREFIX, binlog_cache_size, MYF(MY_WME)))
3241
3242
 
3242
3243
  npages=(uint)file_length/tc_log_page_size;
3243
3244
  assert(npages >= 3);             // to guarantee non-empty pool
3244
 
  if (!(pages=(PAGE *)my_malloc(npages*sizeof(PAGE), MYF(MY_WME|MY_ZEROFILL))))
 
3245
  if (!(pages=(PAGE *)malloc(npages*sizeof(PAGE))))
3245
3246
    goto err;
 
3247
  memset(pages, 0, npages*sizeof(PAGE));
3246
3248
  inited=3;
3247
3249
  for (pg=pages, i=0; i < npages; i++, pg++)
3248
3250
  {