~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/default.cc

  • Committer: Monty Taylor
  • Date: 2008-11-07 00:37:57 UTC
  • mfrom: (575.3.1 c++ize)
  • mto: This revision was merged to the branch mainline in revision 579.
  • Revision ID: monty@inaugust.com-20081107003757-ahi7yycs9t23sima
MergedĀ fromĀ c++ize.

Show diffs side-by-side

added added

removed removed

Lines of Context:
172
172
      extra_groups[i]= group->type_names[i]; /** copy group */
173
173
      
174
174
      len= strlen(extra_groups[i]);
175
 
      if (!(ptr= alloc_root(ctx->alloc, len+instance_len+1)))
 
175
      if (!(ptr= (char *)alloc_root(ctx->alloc, len+instance_len+1)))
176
176
        goto err;
177
177
      
178
178
      extra_groups[i+group->count]= ptr;
271
271
 
272
272
  if (find_type((char *)group_name, ctx->group, 3))
273
273
  {
274
 
    if (!(tmp= alloc_root(ctx->alloc, strlen(option) + 1)))
 
274
    if (!(tmp= (char *)alloc_root(ctx->alloc, strlen(option) + 1)))
275
275
      return 1;
276
276
    if (insert_dynamic(ctx->args, (unsigned char*) &tmp))
277
277
      return 1;