← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/module/loader.cc

  • Committer: lbieber
  • Date: 2010-09-03 16:48:23 UTC
  • mfrom: (1745.1.1 build)
  • Revision ID: lbieber@orisndriz03-20100903164823-eitu0jg37zse0s0a
Merge Andrew -  fix bugs 628364 and 629066 - Remove variables defaults from drizzled --help, clean up --print-defaults message

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/module/loader.cc
79
79
const char *opt_plugin_load_default= PANDORA_PLUGIN_LIST;
80
80
const char *builtin_plugins= PANDORA_BUILTIN_LIST;
81
81
 
 
82
extern bool opt_print_defaults;
 
83
 
82
84
/* Note that 'int version' must be the first field of every plugin
83
85
   sub-structure (plugin->info).
84
86
*/
1820
1822
  /* main_options now points to the empty option terminator */
1821
1823
  all_options.push_back(*main_options);
1822
1824
 
1823
 
  my_print_help(&*(all_options.begin()));
1824
 
  cout << long_options << endl;
1825
 
  my_print_variables(&*(all_options.begin()));
 
1825
  if (!opt_print_defaults)
 
1826
  {
 
1827
    my_print_help(&*(all_options.begin()));
 
1828
    cout << long_options << endl;
 
1829
  }
 
1830
  else
 
1831
  {
 
1832
    my_print_variables(&*(all_options.begin()));
 
1833
  }
1826
1834
 
1827
1835
  mem_root.free_root(MYF(0));
1828
1836
}