← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/default.cc

  • Committer: Brian Aker
  • Date: 2009-07-21 00:55:33 UTC
  • mfrom: (1093.1.21 captain)
  • Revision ID: brian@gaz-20090721005533-ran2v2otw7tbmiym
Merge Jay

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/default.cc
164
164
    /* Handle --defaults-group-suffix= */
165
165
    uint32_t i;
166
166
    const char **extra_groups;
167
 
    const uint32_t instance_len= strlen(my_defaults_group_suffix);
 
167
    const size_t instance_len= strlen(my_defaults_group_suffix);
168
168
    struct handle_option_ctx *ctx= (struct handle_option_ctx*) func_ctx;
169
169
    char *ptr;
170
170
    TYPELIB *group= ctx->group;
176
176
 
177
177
    for (i= 0; i < group->count; i++)
178
178
    {
179
 
      uint32_t len;
 
179
      size_t len;
180
180
      extra_groups[i]= group->type_names[i]; /** copy group */
181
181
 
182
182
      len= strlen(extra_groups[i]);
455
455
    memcpy(res+1+args.elements, *argv + 1, (*argc-1)*sizeof(char*));
456
456
  res[args.elements+ *argc]=0;                  /* last null */
457
457
 
458
 
  (*argc)+=args.elements;
459
 
  *argv= (char**) res;
 
458
  (*argc)+=int(args.elements);
 
459
  *argv= static_cast<char**>(res);
460
460
  *(MEM_ROOT*) ptr= alloc;                      /* Save alloc root for free */
461
461
  delete_dynamic(&args);
462
462
  if (found_print_defaults)