← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzledump.cc

  • Committer: Brian Aker
  • Date: 2010-04-19 19:23:14 UTC
  • Revision ID: brian@gaz-20100419192314-47vro57tcn607i61
More updates for memory::Root

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzledump.cc
2433
2433
    */
2434
2434
    row= drizzle_row_next(&result);
2435
2435
    lengths= drizzle_row_field_sizes(&result);
2436
 
    name= strmake_root(root, row[0], lengths[0]);
 
2436
    name= root->strmake_root(row[0], lengths[0]);
2437
2437
  }
2438
2438
  drizzle_result_free(&result);
2439
2439
 
2452
2452
  if (init_dumping(db, init_dumping_tables))
2453
2453
    return(1);
2454
2454
 
2455
 
  init_alloc_root(&root, 8192);
 
2455
  root.init_alloc_root(8192);
2456
2456
  if (!(dump_tables= pos= (char**) root.alloc_root(tables * sizeof(char *))))
2457
2457
    die(EX_EOM, _("alloc_root failure."));
2458
2458
 
2467
2467
    {
2468
2468
      if (!ignore_errors)
2469
2469
      {
2470
 
        free_root(&root, MYF(0));
 
2470
        root.free_root(MYF(0));
2471
2471
      }
2472
2472
      maybe_die(EX_ILLEGAL_TABLE, _("Couldn't find table: \"%s\""), *table_names);
2473
2473
      /* We shall countinue here, if --force was given */
2481
2481
        ret != DRIZZLE_RETURN_OK)
2482
2482
    {
2483
2483
      if (!ignore_errors)
2484
 
        free_root(&root, MYF(0));
 
2484
        root.free_root(MYF(0));
2485
2485
      DB_error(&result, ret, _("when doing refresh"));
2486
2486
      /* We shall countinue here, if --force was given */
2487
2487
    }
2495
2495
  for (pos= dump_tables; pos < end; pos++)
2496
2496
    dump_table(*pos, db);
2497
2497
 
2498
 
  free_root(&root, MYF(0));
 
2498
  root.free_root(MYF(0));
2499
2499
  free(order_by);
2500
2500
  order_by= 0;
2501
2501
  if (opt_xml)