← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/sql_plugin.cc

  • Committer: Monty Taylor
  • Date: 2008-07-11 16:06:20 UTC
  • mto: (77.6.1 glibclient-merge)
  • mto: This revision was merged to the branch mainline in revision 134.
  • Revision ID: monty@inaugust.com-20080711160620-eni0gu3pqd2fgc6s
One last bunch of warnings edits.

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/sql_plugin.cc
2557
2557
  options[0].arg_type= options[1].arg_type= NO_ARG;
2558
2558
  options[0].def_value= options[1].def_value= **enabled;
2559
2559
  options[0].value= options[0].u_max_value=
2560
 
  options[1].value= options[1].u_max_value= (uchar**) (name - 1);
 
2560
  options[1].value= options[1].u_max_value= (char**) (name - 1);
2561
2561
  options+= 2;
2562
2562
 
2563
2563
  /*
2714
2714
    plugin_opt_set_limits(options, opt);
2715
2715
 
2716
2716
    if (opt->flags & PLUGIN_VAR_THDLOCAL)
2717
 
      options->value= options->u_max_value= (uchar**)
 
2717
      options->value= options->u_max_value= (char**)
2718
2718
        (global_system_variables.dynamic_variables_ptr + offset);
2719
2719
    else
2720
 
      options->value= options->u_max_value= *(uchar***) (opt + 1);
 
2720
      options->value= options->u_max_value= *(char***) (opt + 1);
2721
2721
 
2722
2722
    options[1]= options[0];
2723
2723
    options[1].name= p= (char*) alloc_root(mem_root, optnamelen + 8);