← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/unireg.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/unireg.cc
138
138
 
139
139
  if (error)
140
140
  {
141
 
    my_free(screen_buff, MYF(0));
 
141
    free(screen_buff);
142
142
    if (! pack_header_error_handler.is_handled)
143
143
      return(1);
144
144
 
149
149
                    create_fields,info_length,
150
150
                    screens, create_info->table_options, data_offset, db_file))
151
151
    {
152
 
      my_free(screen_buff, MYF(0));
 
152
      free(screen_buff);
153
153
      return(1);
154
154
    }
155
155
  }
186
186
    my_error(ER_WRONG_STRING_LENGTH, MYF(0),
187
187
             create_info->comment.str,"Table COMMENT",
188
188
             (uint) TABLE_COMMENT_MAXLEN);
189
 
    my_free(screen_buff,MYF(0));
 
189
    free(screen_buff);
190
190
    return(1);
191
191
  }
192
192
 
213
213
  if ((file=create_frm(thd, file_name, db, table, reclength, fileinfo,
214
214
                       create_info, keys, key_info)) < 0)
215
215
  {
216
 
    my_free(screen_buff, MYF(0));
 
216
    free(screen_buff);
217
217
    return(1);
218
218
  }
219
219
 
311
311
      pack_fields(file, create_fields, data_offset))
312
312
    goto err;
313
313
 
314
 
  my_free(screen_buff,MYF(0));
315
 
  my_free(keybuff, MYF(0));
 
314
  free(screen_buff);
 
315
  free(keybuff);
316
316
 
317
317
  if (!(create_info->options & HA_LEX_CREATE_TMP_TABLE) &&
318
318
      (my_sync(file, MYF(MY_WME)) ||
341
341
  return(0);
342
342
 
343
343
err:
344
 
  my_free(screen_buff, MYF(0));
345
 
  my_free(keybuff, MYF(0));
 
344
  free(screen_buff);
 
345
  free(keybuff);
346
346
err2:
347
347
  my_close(file,MYF(MY_WME));
348
348
err3:
992
992
  error= my_write(file, buff, (size_t) reclength,MYF_RW) != 0;
993
993
 
994
994
err:
995
 
  my_free(buff, MYF(MY_FAE));
 
995
  free(buff);
996
996
  thd->count_cuted_fields= old_count_cuted_fields;
997
997
  return(error);
998
998
} /* make_empty_rec */