← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/internal/default.cc

  • Committer: Stewart Smith
  • Date: 2011-03-03 07:00:26 UTC
  • mfrom: (2215 staging)
  • mto: (2241.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 2242.
  • Revision ID: stewart@flamingspork.com-20110303070026-0lqlcq74n566syro
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/internal/default.cc
292
292
  {
293
293
    if (!(tmp= (char *)ctx->alloc->alloc_root(strlen(option) + 1)))
294
294
      return 1;
295
 
    if (insert_dynamic(ctx->args, (unsigned char*) &tmp))
296
 
      return 1;
 
295
    ctx->args->push_back(&tmp);
297
296
    strcpy(tmp, option);
298
297
  }
299
298