← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/sql_plugin.cc

  • Committer: Brian Aker
  • Date: 2008-06-29 15:16:28 UTC
  • Revision ID: brian@tangent.org-20080629151628-404kr7u1sd278qoz
Warnings cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_plugin.cc
2686
2686
      if (!opt->update)
2687
2687
      {
2688
2688
        opt->update= update_func_str;
2689
 
        if (!(opt->flags & PLUGIN_VAR_MEMALLOC | PLUGIN_VAR_READONLY))
 
2689
        if ((opt->flags & (PLUGIN_VAR_MEMALLOC | PLUGIN_VAR_READONLY)) == false)
2690
2690
        {
2691
2691
          opt->flags|= PLUGIN_VAR_READONLY;
2692
2692
          sql_print_warning("Server variable %s of plugin %s was forced "
2791
2791
  uint count= EXTRA_OPTIONS;
2792
2792
  DBUG_ENTER("construct_help_options");
2793
2793
 
2794
 
  for (opt= p->plugin->system_vars; opt && *opt; opt++, count+= 2);
 
2794
  for (opt= p->plugin->system_vars; opt && *opt; opt++, count+= 2) {};
2795
2795
 
2796
2796
  if (!(opts= (my_option*) alloc_root(mem_root, sizeof(my_option) * count)))
2797
2797
    DBUG_RETURN(NULL);