Merge lp:~linuxjedi/drizzle/drizzle-bug-628364 into lp:~drizzle-trunk/drizzle/development

[Andrew Hutchings]

Remove variables defaults from drizzled --help. Cannot remove function completely as it is used by my_print_defaults which in-turn is used by dtr and startup scripts which we supply.

[Andrew Hutchings (linuxjedi)]

Branch completely breaks dtr now :/

review: Needs Fixing

[Andrew Hutchings (linuxjedi)]

OK, so. Old behaviour is now in --print-defaults (which was unused and pretty much useless), dtr now uses this option.

=== modified file 'drizzled/drizzled.cc'
--- drizzled/drizzled.cc	2010-08-29 17:59:12 +0000
+++ drizzled/drizzled.cc	2010-09-02 21:51:48 +0000
@@ -198,6 +198,7 @@
 */
 bool opt_help= false;
 bool opt_help_extended= false;
+bool opt_print_defaults= false;
 
 arg_cmp_func Arg_comparator::comparator_matrix[5][2] =
 {{&Arg_comparator::compare_string,     &Arg_comparator::compare_e_string},
@@ -478,7 +479,7 @@
 
   if (exit_code)
     errmsg_printf(ERRMSG_LVL_ERROR, _("Aborting\n"));
-  else if (opt_help || opt_help_extended)
+  else if (opt_help || opt_help_extended || opt_print_defaults)
     usage();
   clean_up(!opt_help && (exit_code));
   internal::my_end();
@@ -874,7 +875,7 @@
   }
 
 
-  if (opt_help || opt_help_extended)
+  if (opt_help || opt_help_extended || opt_print_defaults)
     unireg_abort(0);
 
   po::parsed_options parsed= po::command_line_parser(defaults_argc,
@@ -1023,12 +1024,14 @@
   OPT_PLUGIN_DIR,
   OPT_PORT_OPEN_TIMEOUT,
   OPT_SECURE_FILE_PRIV,
-  OPT_MIN_EXAMINED_ROW_LIMIT
+  OPT_MIN_EXAMINED_ROW_LIMIT,
+  OPT_PRINT_DEFAULTS
 };
 
 
 struct option my_long_options[] =
 {
+
   {"help", '?', N_("Display this help and exit."),
    (char**) &opt_help, (char**) &opt_help, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0,
    0, 0},
@@ -1036,6 +1039,10 @@
    N_("Display this help and exit after initializing plugins."),
    (char**) &opt_help_extended, (char**) &opt_help_extended,
    0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+  {"print-defaults", OPT_PRINT_DEFAULTS,
+   N_("Print the default settings and exit"),
+   (char**) &opt_print_defaults, (char**) &opt_print_defaults, 0, GET_BOOL,
+   NO_ARG, 0, 0, 0, 0, 0, 0},
   {"auto-increment-increment", OPT_AUTO_INCREMENT,
    N_("Auto-increment columns are incremented by this"),
    (char**) &global_system_variables.auto_increment_increment,
@@ -1382,20 +1389,21 @@
          "This software comes with ABSOLUTELY NO WARRANTY. "
          "This is free software,\n"
          "and you are welcome to modify and redistribute it under the GPL "
-         "license\n\n"
-         "Starts the Drizzle database server\n"));
+         "license\n\n"));
 
-  printf(_("Usage: %s [OPTIONS]\n"), internal::my_progname);
+  if (!opt_print_defaults)
   {
-     internal::print_defaults(DRIZZLE_CONFIG_NAME,load_default_groups);
-     puts("");
+    printf(_("Usage: %s [OPTIONS]\n"), internal::my_progname);
+
+    internal::print_defaults(DRIZZLE_CONFIG_NAME,load_default_groups);
+    puts("");
+  }
  
-     /* Print out all the options including plugin supplied options */
-     my_print_help_inc_plugins(my_long_options, long_options);
-  }
+  /* Print out all the options including plugin supplied options */
+  my_print_help_inc_plugins(my_long_options, long_options);
+
 }
 
-
 /**
   Initialize all Drizzle global variables to default values.
 
@@ -1758,7 +1766,7 @@
   internal::convert_dirname(buff,buff,NULL);
   (void) internal::my_load_path(language,language,buff);
 
-  if (not opt_help and not opt_help_extended)
+  if (not opt_help and not opt_help_extended and not opt_print_defaults)
   {
     char *tmp_string;
     struct stat buf;

=== modified file 'drizzled/internal/default.cc'
--- drizzled/internal/default.cc	2010-04-19 19:23:14 +0000
+++ drizzled/internal/default.cc	2010-09-02 21:51:48 +0000
@@ -399,7 +399,6 @@
 {
   DYNAMIC_ARRAY args;
   TYPELIB group;
-  bool found_print_defaults= 0;
   uint32_t args_used= 0;
   int error= 0;
   memory::Root alloc(512);
@@ -464,12 +463,6 @@
     Check if we wan't to see the new argument list
     This options must always be the last of the default options
   */
-  if (*argc >= 2 && !strcmp(argv[0][1],"--print-defaults"))
-  {
-    found_print_defaults=1;
-    --*argc; ++*argv;				/* skip argument */
-  }
-
   if (*argc)
     memcpy(res+1+args.elements, *argv + 1, (*argc-1)*sizeof(char*));
   res[args.elements+ *argc]=0;			/* last null */
@@ -478,16 +471,7 @@
   *argv= static_cast<char**>(res);
   *(memory::Root*) ptr= alloc;			/* Save alloc root for free */
   delete_dynamic(&args);
-  if (found_print_defaults)
-  {
-    int i;
-    printf("%s would have been started with the following arguments:\n",
-	   **argv);
-    for (i=1 ; i < *argc ; i++)
-      printf("%s ", (*argv)[i]);
-    puts("");
-    exit(0);
-  }
+
   return(error);
 
  err:
@@ -952,7 +936,6 @@
     }
   }
   puts("\nThe following options may be given as the first argument:\n\
-  --print-defaults	Print the program argument list and exit\n\
   --no-defaults		Don't read default options from any options file\n\
   --defaults-file=#	Only read default options from the given file #\n\
   --defaults-extra-file=# Read this file after the global files are read");

=== modified file 'drizzled/module/loader.cc'
--- drizzled/module/loader.cc	2010-08-29 18:01:19 +0000
+++ drizzled/module/loader.cc	2010-09-02 21:51:48 +0000
@@ -79,6 +79,8 @@
 const char *opt_plugin_load_default= PANDORA_PLUGIN_LIST;
 const char *builtin_plugins= PANDORA_BUILTIN_LIST;
 
+extern bool opt_print_defaults;
+
 /* Note that 'int version' must be the first field of every plugin
    sub-structure (plugin->info).
 */
@@ -1820,9 +1822,15 @@
   /* main_options now points to the empty option terminator */
   all_options.push_back(*main_options);
 
-  my_print_help(&*(all_options.begin()));
-  cout << long_options << endl;
-  my_print_variables(&*(all_options.begin()));
+  if (!opt_print_defaults)
+  {
+    my_print_help(&*(all_options.begin()));
+    cout << long_options << endl;
+  }
+  else
+  {
+    my_print_variables(&*(all_options.begin()));
+  }
 
   mem_root.free_root(MYF(0));
 }

=== modified file 'tests/test-run.pl'
--- tests/test-run.pl	2010-08-30 22:11:56 +0000
+++ tests/test-run.pl	2010-09-02 21:51:48 +0000
@@ -1177,7 +1177,7 @@
   #
   # --datadir must exist, mysqld will chdir into it
   #
-  my $list= `$exe_drizzled --no-defaults --datadir=$tmpdir --skip-grant-tables --verbose --help`;
+  my $list= `$exe_drizzled --no-defaults --datadir=$tmpdir --skip-grant-tables --print-defaults`;
 
   foreach my $line (split('\n', $list))
   {