← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/default.cc

  • Committer: Monty Taylor
  • Date: 2009-07-17 22:25:54 UTC
  • mto: (1093.1.20 captain)
  • mto: This revision was merged to the branch mainline in revision 1098.
  • Revision ID: mordred@inaugust.com-20090717222554-513791zlug0rzlkk
Some changes that I lost...

Show diffs side-by-side

added added

removed removed

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