bk commit into 5.0 tree (hartmut:1.2251) BUG#21994

['Hartmut Holzgraefe']

Below is the list of changes that have just been committed into a local
5.0 repository of hartmut. When hartmut does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-04 16:33:56+02:00, hartmut@stripped +14 -0
  added print_defaults() calls to --help output for all binaries (Bug #21994)

  ndb/src/cw/cpcd/main.cpp@stripped, 2006-09-04 16:33:53+02:00, hartmut@stripped +2 -0
    added print_defaults() calls to --help output for all binaries

  ndb/src/kernel/vm/Configuration.cpp@stripped, 2006-09-04 16:33:53+02:00, hartmut@stripped
+4 -1
    added print_defaults() calls to --help output for all binaries

  ndb/src/mgmclient/main.cpp@stripped, 2006-09-04 16:33:53+02:00, hartmut@stripped +3 -1
    added print_defaults() calls to --help output for all binaries

  ndb/src/mgmsrv/main.cpp@stripped, 2006-09-04 16:33:53+02:00, hartmut@stripped +3 -1
    added print_defaults() calls to --help output for all binaries

  ndb/tools/delete_all.cpp@stripped, 2006-09-04 16:33:53+02:00, hartmut@stripped +4 -1
    added print_defaults() calls to --help output for all binaries

  ndb/tools/desc.cpp@stripped, 2006-09-04 16:33:53+02:00, hartmut@stripped +5 -1
    added print_defaults() calls to --help output for all binaries

  ndb/tools/drop_index.cpp@stripped, 2006-09-04 16:33:53+02:00, hartmut@stripped +5 -1
    added print_defaults() calls to --help output for all binaries

  ndb/tools/drop_tab.cpp@stripped, 2006-09-04 16:33:53+02:00, hartmut@stripped +6 -2
    added print_defaults() calls to --help output for all binaries

  ndb/tools/listTables.cpp@stripped, 2006-09-04 16:33:53+02:00, hartmut@stripped +4 -1
    added print_defaults() calls to --help output for all binaries

  ndb/tools/ndb_config.cpp@stripped, 2006-09-04 16:33:53+02:00, hartmut@stripped +4 -1
    added print_defaults() calls to --help output for all binaries

  ndb/tools/restore/restore_main.cpp@stripped, 2006-09-04 16:33:53+02:00, hartmut@stripped +4
-1
    added print_defaults() calls to --help output for all binaries

  ndb/tools/select_all.cpp@stripped, 2006-09-04 16:33:53+02:00, hartmut@stripped +4 -1
    added print_defaults() calls to --help output for all binaries

  ndb/tools/select_count.cpp@stripped, 2006-09-04 16:33:53+02:00, hartmut@stripped +5 -1
    added print_defaults() calls to --help output for all binaries

  ndb/tools/waiter.cpp@stripped, 2006-09-04 16:33:53+02:00, hartmut@stripped +5 -1
    added print_defaults() calls to --help output for all binaries

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	hartmut
# Host:	linux.site
# Root:	/home/hartmut/projects/mysql/dev/teamtrees/mysql-5.0-ndb

--- 1.13/ndb/tools/ndb_config.cpp	2006-09-04 16:34:05 +02:00
+++ 1.14/ndb/tools/ndb_config.cpp	2006-09-04 16:34:05 +02:00
@@ -45,6 +45,8 @@
 static const char * g_config_file = 0;
 static int g_mycnf = 0;
 
+const char *load_default_groups[]= { "mysql_cluster",0 };
+
 int g_print_full_config, opt_ndb_shm;
 my_bool opt_core;
 
@@ -114,6 +116,8 @@
   char desc[] = 
     "This program will retreive config options for a ndb cluster\n";
   ndb_std_print_version();
+  print_defaults(MYSQL_CONFIG_NAME,load_default_groups);
+  puts("");
   my_print_help(my_long_options);
   my_print_variables(my_long_options);
 }
@@ -176,7 +180,6 @@
 int
 main(int argc, char** argv){
   NDB_INIT(argv[0]);
-  const char *load_default_groups[]= { "mysql_cluster",0 };
   load_defaults("my",load_default_groups,&argc,&argv);
   int ho_error;
   if ((ho_error=handle_options(&argc, &argv, my_long_options,

--- 1.9/ndb/src/cw/cpcd/main.cpp	2006-09-04 16:34:05 +02:00
+++ 1.10/ndb/src/cw/cpcd/main.cpp	2006-09-04 16:34:05 +02:00
@@ -82,6 +82,8 @@
 
   load_defaults("ndb_cpcd",load_default_groups,&argc,&argv);
   if (handle_options(&argc, &argv, my_long_options, get_one_option)) {
+    print_defaults(MYSQL_CONFIG_NAME,load_default_groups);
+    puts("");
     my_print_help(my_long_options);
     my_print_variables(my_long_options);
     exit(1);

--- 1.34/ndb/tools/restore/restore_main.cpp	2006-09-04 16:34:05 +02:00
+++ 1.35/ndb/tools/restore/restore_main.cpp	2006-09-04 16:34:05 +02:00
@@ -52,6 +52,8 @@
 static int _restore_meta = 0;
 BaseString g_options("ndb_restore");
 
+const char *load_default_groups[]= { "mysql_cluster","ndb_restore",0 };
+
 static struct my_option my_long_options[] =
 {
   NDB_STD_OPTS("ndb_restore"),
@@ -104,6 +106,8 @@
 {
   short_usage_sub();
   ndb_std_print_version();
+  print_defaults(MYSQL_CONFIG_NAME,load_default_groups);
+  puts("");
   my_print_help(my_long_options);
   my_print_variables(my_long_options);
 }
@@ -136,7 +140,6 @@
 bool
 readArguments(int *pargc, char*** pargv) 
 {
-  const char *load_default_groups[]= { "mysql_cluster","ndb_restore",0 };
   load_defaults("my",load_default_groups,pargc,pargv);
   if (handle_options(pargc, pargv, my_long_options, get_one_option))
   {

--- 1.47/ndb/src/kernel/vm/Configuration.cpp	2006-09-04 16:34:05 +02:00
+++ 1.48/ndb/src/kernel/vm/Configuration.cpp	2006-09-04 16:34:05 +02:00
@@ -63,6 +63,8 @@
 extern Uint32 g_start_type;
 extern NdbNodeBitmask g_nowait_nodes;
 
+const char *load_default_groups[]= { "mysql_cluster","ndbd",0 };
+
 /**
  * Arguments to NDB process
  */ 
@@ -108,6 +110,8 @@
 {
   short_usage_sub();
   ndb_std_print_version();
+  print_defaults(MYSQL_CONFIG_NAME,load_default_groups);
+  puts("");
   my_print_help(my_long_options);
   my_print_variables(my_long_options);
 }
@@ -115,7 +119,6 @@
 bool
 Configuration::init(int argc, char** argv)
 {  
-  const char *load_default_groups[]= { "mysql_cluster","ndbd",0 };
   load_defaults("my",load_default_groups,&argc,&argv);
 
   int ho_error;

--- 1.21/ndb/src/mgmclient/main.cpp	2006-09-04 16:34:05 +02:00
+++ 1.22/ndb/src/mgmclient/main.cpp	2006-09-04 16:34:05 +02:00
@@ -38,6 +38,7 @@
 #include "ndb_mgmclient.hpp"
 
 const char *progname = "ndb_mgm";
+const char *load_default_groups[]= { "mysql_cluster","ndb_mgm",0 };
 
 
 static Ndb_mgmclient* com;
@@ -87,6 +88,8 @@
 {
   short_usage_sub();
   ndb_std_print_version();
+  print_defaults(MYSQL_CONFIG_NAME,load_default_groups);
+  puts("");
   my_print_help(my_long_options);
   my_print_variables(my_long_options);
 }
@@ -128,7 +131,6 @@
   NDB_INIT(argv[0]);
   const char *_host = 0;
   int _port = 0;
-  const char *load_default_groups[]= { "mysql_cluster","ndb_mgm",0 };
 
   load_defaults("my",load_default_groups,&argc,&argv);
   int ho_error;

--- 1.47/ndb/src/mgmsrv/main.cpp	2006-09-04 16:34:05 +02:00
+++ 1.48/ndb/src/mgmsrv/main.cpp	2006-09-04 16:34:05 +02:00
@@ -47,6 +47,7 @@
 #define DEBUG(x) ndbout << x << endl;
 
 const char progname[] = "mgmtsrvr";
+const char *load_default_groups[]= { "mysql_cluster","ndb_mgmd",0 };
 
 // copied from mysql.cc to get readline
 extern "C" {
@@ -183,6 +184,8 @@
 {
   short_usage_sub();
   ndb_std_print_version();
+  print_defaults(MYSQL_CONFIG_NAME,load_default_groups);
+  puts("");
   my_print_help(my_long_options);
   my_print_variables(my_long_options);
 }
@@ -196,7 +199,6 @@
 
   NDB_INIT(argv[0]);
 
-  const char *load_default_groups[]= { "mysql_cluster","ndb_mgmd",0 };
   load_defaults("my",load_default_groups,&argc,&argv);
 
   int ho_error;

--- 1.18/ndb/tools/delete_all.cpp	2006-09-04 16:34:05 +02:00
+++ 1.19/ndb/tools/delete_all.cpp	2006-09-04 16:34:05 +02:00
@@ -27,6 +27,8 @@
 
 NDB_STD_OPTS_VARS;
 
+const char *load_default_groups[]= { "mysql_cluster",0 };
+
 static const char* _dbname = "TEST_DB";
 static my_bool _transactional = false;
 static struct my_option my_long_options[] =
@@ -46,13 +48,14 @@
     "tabname\n"\
     "This program will delete all records in the specified table using scan delete.\n";
   ndb_std_print_version();
+  print_defaults(MYSQL_CONFIG_NAME,load_default_groups);
+  puts("");
   my_print_help(my_long_options);
   my_print_variables(my_long_options);
 }
 
 int main(int argc, char** argv){
   NDB_INIT(argv[0]);
-  const char *load_default_groups[]= { "mysql_cluster",0 };
   load_defaults("my",load_default_groups,&argc,&argv);
   int ho_error;
 #ifndef DBUG_OFF

--- 1.20/ndb/tools/desc.cpp	2006-09-04 16:34:05 +02:00
+++ 1.21/ndb/tools/desc.cpp	2006-09-04 16:34:05 +02:00
@@ -24,6 +24,9 @@
 static const char* _dbname = "TEST_DB";
 static int _unqualified = 0;
 static int _partinfo = 0;
+
+const char *load_default_groups[]= { "mysql_cluster",0 };
+
 static struct my_option my_long_options[] =
 {
   NDB_STD_OPTS("ndb_desc"),
@@ -45,6 +48,8 @@
     "This program list all properties of table(s) in NDB Cluster.\n"\
     "  ex: desc T1 T2 T4\n";
   ndb_std_print_version();
+  print_defaults(MYSQL_CONFIG_NAME,load_default_groups);
+  puts("");
   my_print_help(my_long_options);
   my_print_variables(my_long_options);
 }
@@ -53,7 +58,6 @@
 
 int main(int argc, char** argv){
   NDB_INIT(argv[0]);
-  const char *load_default_groups[]= { "mysql_cluster",0 };
   load_defaults("my",load_default_groups,&argc,&argv);
   int ho_error;
 #ifndef DBUG_OFF

--- 1.14/ndb/tools/drop_index.cpp	2006-09-04 16:34:05 +02:00
+++ 1.15/ndb/tools/drop_index.cpp	2006-09-04 16:34:05 +02:00
@@ -24,6 +24,9 @@
 NDB_STD_OPTS_VARS;
 
 static const char* _dbname = "TEST_DB";
+
+const char *load_default_groups[]= { "mysql_cluster",0 };
+
 static struct my_option my_long_options[] =
 {
   NDB_STD_OPTS("ndb_desc"),
@@ -38,13 +41,14 @@
     "[<table> <index>]+\n"\
     "This program will drop index(es) in Ndb\n";
   ndb_std_print_version();
+  print_defaults(MYSQL_CONFIG_NAME,load_default_groups);
+  puts("");
   my_print_help(my_long_options);
   my_print_variables(my_long_options);
 }
 
 int main(int argc, char** argv){
   NDB_INIT(argv[0]);
-  const char *load_default_groups[]= { "mysql_cluster",0 };
   load_defaults("my",load_default_groups,&argc,&argv);
   int ho_error;
 #ifndef DBUG_OFF

--- 1.14/ndb/tools/drop_tab.cpp	2006-09-04 16:34:05 +02:00
+++ 1.15/ndb/tools/drop_tab.cpp	2006-09-04 16:34:05 +02:00
@@ -24,6 +24,9 @@
 NDB_STD_OPTS_VARS;
 
 static const char* _dbname = "TEST_DB";
+
+const char *load_default_groups[]= { "mysql_cluster",0 };
+
 static struct my_option my_long_options[] =
 {
   NDB_STD_OPTS("ndb_desc"),
@@ -37,14 +40,15 @@
   char desc[] = 
     "tabname\n"\
     "This program will drop one table in Ndb\n";
-  ndb_std_print_version();
+  ndb_std_print_version();  
+  print_defaults(MYSQL_CONFIG_NAME,load_default_groups);
+  puts("");
   my_print_help(my_long_options);
   my_print_variables(my_long_options);
 }
 
 int main(int argc, char** argv){
   NDB_INIT(argv[0]);
-  const char *load_default_groups[]= { "mysql_cluster",0 };
   load_defaults("my",load_default_groups,&argc,&argv);
   int ho_error;
 #ifndef DBUG_OFF

--- 1.21/ndb/tools/listTables.cpp	2006-09-04 16:34:05 +02:00
+++ 1.22/ndb/tools/listTables.cpp	2006-09-04 16:34:05 +02:00
@@ -32,6 +32,8 @@
 static const NdbDictionary::Dictionary * dic = 0;
 static int _unqualified = 0;
 
+const char *load_default_groups[]= { "mysql_cluster",0 };
+
 static void
 fatal(char const* fmt, ...)
 {
@@ -196,6 +198,8 @@
     "To show all indexes for a table write table name as final argument\n"\
     "  ex: ndb_show_tables T1\n";
   ndb_std_print_version();
+  print_defaults(MYSQL_CONFIG_NAME,load_default_groups);
+  puts("");
   my_print_help(my_long_options);
   my_print_variables(my_long_options);
 }
@@ -203,7 +207,6 @@
 int main(int argc, char** argv){
   NDB_INIT(argv[0]);
   const char* _tabname;
-  const char *load_default_groups[]= { "mysql_cluster",0 };
   load_defaults("my",load_default_groups,&argc,&argv);
   int ho_error;
 #ifndef DBUG_OFF

--- 1.22/ndb/tools/select_all.cpp	2006-09-04 16:34:05 +02:00
+++ 1.23/ndb/tools/select_all.cpp	2006-09-04 16:34:05 +02:00
@@ -43,6 +43,8 @@
 static int _unqualified, _header, _parallelism, _useHexFormat, _lock,
   _order, _descending;
 
+const char *load_default_groups[]= { "mysql_cluster",0 };
+
 static struct my_option my_long_options[] =
 {
   NDB_STD_OPTS("ndb_desc"),
@@ -82,13 +84,14 @@
     "It can also be used to dump the content of a table to file \n"\
     "  ex: select_all --no-header --delimiter=';' T4 > T4.data\n";
   ndb_std_print_version();
+  print_defaults(MYSQL_CONFIG_NAME,load_default_groups);
+  puts("");
   my_print_help(my_long_options);
   my_print_variables(my_long_options);
 }
 
 int main(int argc, char** argv){
   NDB_INIT(argv[0]);
-  const char *load_default_groups[]= { "mysql_cluster",0 };
   load_defaults("my",load_default_groups,&argc,&argv);
   const char* _tabname;
   int ho_error;

--- 1.19/ndb/tools/select_count.cpp	2006-09-04 16:34:05 +02:00
+++ 1.20/ndb/tools/select_count.cpp	2006-09-04 16:34:05 +02:00
@@ -37,6 +37,9 @@
 static const char* _dbname = "TEST_DB";
 static int _parallelism = 240;
 static int _lock = 0;
+
+const char *load_default_groups[]= { "mysql_cluster",0 };
+
 static struct my_option my_long_options[] =
 {
   NDB_STD_OPTS("ndb_desc"),
@@ -57,13 +60,14 @@
     "tabname1 ... tabnameN\n"\
     "This program will count the number of records in tables\n";
   ndb_std_print_version();
+  print_defaults(MYSQL_CONFIG_NAME,load_default_groups);
+  puts("");
   my_print_help(my_long_options);
   my_print_variables(my_long_options);
 }
 
 int main(int argc, char** argv){
   NDB_INIT(argv[0]);
-  const char *load_default_groups[]= { "mysql_cluster",0 };
   load_defaults("my",load_default_groups,&argc,&argv);
   int ho_error;
 #ifndef DBUG_OFF

--- 1.24/ndb/tools/waiter.cpp	2006-09-04 16:34:05 +02:00
+++ 1.25/ndb/tools/waiter.cpp	2006-09-04 16:34:05 +02:00
@@ -38,6 +38,9 @@
 static int _no_contact = 0;
 static int _not_started = 0;
 static int _timeout = 120;
+
+const char *load_default_groups[]= { "mysql_cluster",0 };
+
 static struct my_option my_long_options[] =
 {
   NDB_STD_OPTS("ndb_desc"),
@@ -56,13 +59,14 @@
 static void usage()
 {
   ndb_std_print_version();
+  print_defaults(MYSQL_CONFIG_NAME,load_default_groups);
+  puts("");
   my_print_help(my_long_options);
   my_print_variables(my_long_options);
 }
 
 int main(int argc, char** argv){
   NDB_INIT(argv[0]);
-  const char *load_default_groups[]= { "mysql_cluster",0 };
   load_defaults("my",load_default_groups,&argc,&argv);
   const char* _hostName = NULL;
   int ho_error;