← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzle.cc

  • Committer: Brian Aker
  • Date: 2008-12-05 03:17:16 UTC
  • mfrom: (641.3.11 devel)
  • Revision ID: brian@tangent.org-20081205031716-r65xkzugjylmvv1h
Monty merge (a couple of alterations for malloc()).

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzle.cc
1133
1133
      histfile= strdup(getenv("DRIZZLE_HISTFILE"));
1134
1134
    else if (getenv("HOME"))
1135
1135
    {
1136
 
      histfile=(char*) my_malloc((uint) strlen(getenv("HOME"))
1137
 
                                 + (uint) strlen("/.drizzle_history")+2,
1138
 
                                 MYF(MY_WME));
 
1136
      histfile=(char*) malloc(strlen(getenv("HOME")) + strlen("/.drizzle_history") + 2);
1139
1137
      if (histfile)
1140
1138
        sprintf(histfile,"%s/.drizzle_history",getenv("HOME"));
1141
1139
      char link_name[FN_REFLEN];
1152
1150
      if (verbose)
1153
1151
        tee_fprintf(stdout, _("Reading history-file %s\n"),histfile);
1154
1152
      read_history(histfile);
1155
 
      if (!(histfile_tmp= (char*) my_malloc((uint) strlen(histfile) + 5,
1156
 
                                            MYF(MY_WME))))
 
1153
      if (!(histfile_tmp= (char*) malloc((uint) strlen(histfile) + 5)))
1157
1154
      {
1158
1155
        fprintf(stderr, _("Couldn't allocate memory for temp histfile!\n"));
1159
1156
        exit(1);
2930
2927
  
2931
2928
  separator.reserve(256);
2932
2929
 
2933
 
  num_flag=(bool*) my_malloc(sizeof(bool)*drizzle_num_fields(result),
2934
 
                             MYF(MY_WME));
 
2930
  num_flag=(bool*) malloc(sizeof(bool)*drizzle_num_fields(result));
2935
2931
  if (column_types_flag)
2936
2932
  {
2937
2933
    print_field_types(result);