← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzlecheck.cc

  • Committer: Monty Taylor
  • Date: 2008-12-05 00:20:09 UTC
  • mto: This revision was merged to the branch mainline in revision 649.
  • Revision ID: monty@inaugust.com-20081205002009-jwrtjuqzl3seojlb
More removal of my_malloc.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzlecheck.cc
400
400
      tot_length+= fixed_name_length(*(table_names + i)) + 2;
401
401
 
402
402
    if (!(table_names_comma_sep = (char *)
403
 
    my_malloc((sizeof(char) * tot_length) + 4, MYF(MY_WME))))
 
403
          malloc((sizeof(char) * tot_length) + 4)))
404
404
      return 1;
405
405
 
406
406
    for (end = table_names_comma_sep + 1; tables > 0;
407
 
   tables--, table_names++)
 
407
         tables--, table_names++)
408
408
    {
409
409
      end= fix_table_name(end, *table_names);
410
410
      *end++= ',';
488
488
      tot_length+= fixed_name_length(row[0]) + 2;
489
489
    drizzle_data_seek(res, 0);
490
490
 
491
 
    if (!(tables=(char *) my_malloc(sizeof(char)*tot_length+4, MYF(MY_WME))))
 
491
    if (!(tables=(char *) malloc(sizeof(char)*tot_length+4)))
492
492
    {
493
493
      drizzle_free_result(res);
494
494
      return 1;
624
624
    return fix_table_storage_name(tables);
625
625
  }
626
626
 
627
 
  if (!(query =(char *) my_malloc((sizeof(char)*(length+110)), MYF(MY_WME))))
 
627
  if (!(query =(char *) malloc((sizeof(char)*(length+110)))))
628
628
    return 1;
629
629
  if (opt_all_in_1)
630
630
  {