corrected error in ndb programs debug switch

14 files changed, 78 insertions, 120 deletions

diff --git a/ndb/include/util/ndb_opts.h b/ndb/include/util/ndb_opts.h
index f2e2566857b..72abd6d5d7a 100644
--- a/ndb/include/util/ndb_opts.h
+++ b/ndb/include/util/ndb_opts.h
@@ -33,7 +33,11 @@ const char *opt_ndb_connectstring= 0;
 const char *opt_connect_str= 0;
 const char *opt_ndb_mgmd= 0;
 char opt_ndb_constrbuf[1024];
-unsigned opt_ndb_constrbuf_len;
+unsigned opt_ndb_constrbuf_len= 0;
+
+#ifndef DBUG_OFF
+const char *opt_debug= 0;
+#endif
 
 #define OPT_NDB_CONNECTSTRING 'c'
 
@@ -75,7 +79,8 @@ unsigned opt_ndb_constrbuf_len;
 #ifndef DBUG_OFF
 #define NDB_STD_OPTS(prog_name) \
   { "debug", '#', "Output debug log. Often this is 'd:t:o,filename'.", \
-    0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0 }, \
+    (gptr*) &opt_debug, (gptr*) &opt_debug, \
+    0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0 }, \
   NDB_STD_OPTS_COMMON
 #else
 #define NDB_STD_OPTS(prog_name) NDB_STD_OPTS_COMMON
@@ -101,15 +106,21 @@ enum ndb_std_options {
 static my_bool
 ndb_std_get_one_option(int optid,
 		       const struct my_option *opt __attribute__((unused)),
-		       const char *argument)
+		       char *argument)
 {
   switch (optid) {
+#ifndef DBUG_OFF
   case '#':
-    if (argument)
+    if (opt_debug)
     {
-      DBUG_PUSH(argument);
+      DBUG_PUSH(opt_debug);
+    }
+    else
+    {
+      DBUG_PUSH("d:t");
     }
     break;
+#endif
   case 'V':
     ndb_std_print_version();
     exit(0);
diff --git a/ndb/src/kernel/vm/Configuration.cpp b/ndb/src/kernel/vm/Configuration.cpp
index a8b9f64cc7b..3170939f8d8 100644
--- a/ndb/src/kernel/vm/Configuration.cpp
+++ b/ndb/src/kernel/vm/Configuration.cpp
@@ -88,13 +88,6 @@ static void usage()
   my_print_help(my_long_options);
   my_print_variables(my_long_options);
 }
-static my_bool
-get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
-	       char *argument)
-{
-  return ndb_std_get_one_option(optid, opt,
-				argument ? argument : "d:t:O,/tmp/ndbd.trace");
-}
 
 bool
 Configuration::init(int argc, char** argv)
@@ -103,7 +96,11 @@ Configuration::init(int argc, char** argv)
   load_defaults("my",load_default_groups,&argc,&argv);
 
   int ho_error;
-  if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))
+#ifndef DBUG_OFF
+  opt_debug= "d:t:O,/tmp/ndbd.trace";
+#endif
+  if ((ho_error=handle_options(&argc, &argv, my_long_options,
+			       ndb_std_get_one_option)))
     exit(ho_error);
 
   if (_no_daemon) {
diff --git a/ndb/src/mgmclient/main.cpp b/ndb/src/mgmclient/main.cpp
index 73f0bad86c0..19c84f6ec8d 100644
--- a/ndb/src/mgmclient/main.cpp
+++ b/ndb/src/mgmclient/main.cpp
@@ -87,13 +87,6 @@ static void usage()
   my_print_help(my_long_options);
   my_print_variables(my_long_options);
 }
-static my_bool
-get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
-	       char *argument)
-{
-  return ndb_std_get_one_option(optid, opt, argument ? argument :
-				"d:t:O,/tmp/ndb_mgm.trace");
-}
 
 static int 
 read_and_execute(int _try_reconnect) 
@@ -136,7 +129,11 @@ int main(int argc, char** argv){
 
   load_defaults("my",load_default_groups,&argc,&argv);
   int ho_error;
-  if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))
+#ifndef DBUG_OFF
+  opt_debug= "d:t:O,/tmp/ndb_mgm.trace";
+#endif
+  if ((ho_error=handle_options(&argc, &argv, my_long_options,
+			       ndb_std_get_one_option)))
     exit(ho_error);
 
   char buf[MAXHOSTNAMELEN+10];
diff --git a/ndb/src/mgmsrv/main.cpp b/ndb/src/mgmsrv/main.cpp
index cf98fa079e9..3335fdc827c 100644
--- a/ndb/src/mgmsrv/main.cpp
+++ b/ndb/src/mgmsrv/main.cpp
@@ -175,14 +175,6 @@ static void usage()
   my_print_help(my_long_options);
   my_print_variables(my_long_options);
 }
-static my_bool
-get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
-	       char *argument)
-{
-  ndb_std_get_one_option(optid, opt, argument ? argument :
-			 "d:t:O,/tmp/ndb_mgmd.trace");
-  return 0;
-}
 
 /*
  *  MAIN 
@@ -206,7 +198,11 @@ int main(int argc, char** argv)
   load_defaults("my",load_default_groups,&argc,&argv);
 
   int ho_error;
-  if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))
+#ifndef DBUG_OFF
+  opt_debug= "d:t:O,/tmp/ndb_mgmd.trace";
+#endif
+  if ((ho_error=handle_options(&argc, &argv, my_long_options, 
+			       ndb_std_get_one_option)))
     exit(ho_error);
 
   if (glob.interactive ||
diff --git a/ndb/test/ndbapi/testBitfield.cpp b/ndb/test/ndbapi/testBitfield.cpp
index fd76f02e5bf..97cf9478941 100644
--- a/ndb/test/ndbapi/testBitfield.cpp
+++ b/ndb/test/ndbapi/testBitfield.cpp
@@ -8,35 +8,16 @@
 static const char* _dbname = "TEST_DB";
 static int g_loops = 7;
 
-static void print_version()
-{
-  printf("MySQL distrib %s, for %s (%s)\n",
-	 MYSQL_SERVER_VERSION,SYSTEM_TYPE,MACHINE_TYPE);
-}
 static void usage()
 {
-  char desc[] = 
-    "tabname\n"\
-    "This program list all properties of table(s) in NDB Cluster.\n"\
-    "  ex: desc T1 T2 T4\n";  
-  print_version();
+  ndb_std_print_version();
 }
 static my_bool
 get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
 	       char *argument)
 {
-  switch (optid) {
-  case '#':
-    DBUG_PUSH(argument ? argument : "d:t:O,/tmp/ndb_desc.trace");
-    break;
-  case 'V':
-    print_version();
-    exit(0);
-  case '?':
-    usage();
-    exit(0);
-  }
-  return 0;
+  return ndb_std_get_one_option(optid, opt, argument ? argument :
+				"d:t:O,/tmp/testBitfield.trace");
 }
 
 static const NdbDictionary::Table* create_random_table(Ndb*);
diff --git a/ndb/tools/delete_all.cpp b/ndb/tools/delete_all.cpp
index 4a153208c65..2c395a67900 100644
--- a/ndb/tools/delete_all.cpp
+++ b/ndb/tools/delete_all.cpp
@@ -44,20 +44,17 @@ static void usage()
   my_print_help(my_long_options);
   my_print_variables(my_long_options);
 }
-static my_bool
-get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
-	       char *argument)
-{
-  return ndb_std_get_one_option(optid, opt, argument ? argument :
-				"d:t:O,/tmp/ndb_delete_all.trace");
-}
 
 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, get_one_option)))
+#ifndef DBUG_OFF
+  opt_debug= "d:t:O,/tmp/ndb_delete_all.trace";
+#endif
+  if ((ho_error=handle_options(&argc, &argv, my_long_options,
+			       ndb_std_get_one_option)))
     return NDBT_ProgramExit(NDBT_WRONGARGS);
 
   Ndb_cluster_connection con(opt_connect_str);
diff --git a/ndb/tools/desc.cpp b/ndb/tools/desc.cpp
index 3bfa332ea79..be0f6942db5 100644
--- a/ndb/tools/desc.cpp
+++ b/ndb/tools/desc.cpp
@@ -44,20 +44,17 @@ static void usage()
   my_print_help(my_long_options);
   my_print_variables(my_long_options);
 }
-static my_bool
-get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
-	       char *argument)
-{
-  return ndb_std_get_one_option(optid, opt, argument ? argument :
-				"d:t:O,/tmp/ndb_desc.trace");
-}
 
 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, get_one_option)))
+#ifndef DBUG_OFF
+  opt_debug= "d:t:O,/tmp/ndb_desc.trace";
+#endif
+  if ((ho_error=handle_options(&argc, &argv, my_long_options, 
+			       ndb_std_get_one_option)))
     return NDBT_ProgramExit(NDBT_WRONGARGS);
 
   Ndb_cluster_connection con(opt_connect_str);
diff --git a/ndb/tools/drop_index.cpp b/ndb/tools/drop_index.cpp
index 90528a2a5a4..4580d44d121 100644
--- a/ndb/tools/drop_index.cpp
+++ b/ndb/tools/drop_index.cpp
@@ -41,20 +41,17 @@ static void usage()
   my_print_help(my_long_options);
   my_print_variables(my_long_options);
 }
-static my_bool
-get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
-	       char *argument)
-{
-  return ndb_std_get_one_option(optid, opt, argument ? argument :
-				"d:t:O,/tmp/ndb_drop_index.trace");
-}
 
 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, get_one_option)))
+#ifndef DBUG_OFF
+  "d:t:O,/tmp/ndb_drop_index.trace";
+#endif
+  if ((ho_error=handle_options(&argc, &argv, my_long_options,
+			       ndb_std_get_one_option)))
     return NDBT_ProgramExit(NDBT_WRONGARGS);
   if (argc < 1) {
     usage();
diff --git a/ndb/tools/drop_tab.cpp b/ndb/tools/drop_tab.cpp
index a0a5262bace..7ce2b581ff1 100644
--- a/ndb/tools/drop_tab.cpp
+++ b/ndb/tools/drop_tab.cpp
@@ -41,20 +41,17 @@ static void usage()
   my_print_help(my_long_options);
   my_print_variables(my_long_options);
 }
-static my_bool
-get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
-	       char *argument)
-{
-  return ndb_std_get_one_option(optid, opt, argument ? argument :
-				"d:t:O,/tmp/ndb_drop_table.trace");
-}
 
 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, get_one_option)))
+#ifndef DBUG_OFF
+  "d:t:O,/tmp/ndb_drop_table.trace";
+#endif
+  if ((ho_error=handle_options(&argc, &argv, my_long_options,
+			       ndb_std_get_one_option)))
     return NDBT_ProgramExit(NDBT_WRONGARGS);
   if (argc < 1) {
     usage();
diff --git a/ndb/tools/listTables.cpp b/ndb/tools/listTables.cpp
index a49fbde596e..b4a2235f73b 100644
--- a/ndb/tools/listTables.cpp
+++ b/ndb/tools/listTables.cpp
@@ -196,13 +196,6 @@ static void usage()
   my_print_help(my_long_options);
   my_print_variables(my_long_options);
 }
-static my_bool
-get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
-	       char *argument)
-{
-  return ndb_std_get_one_option(optid, opt, argument ? argument :
-				"d:t:O,/tmp/ndb_show_tables.trace");
-}
 
 int main(int argc, char** argv){
   NDB_INIT(argv[0]);
@@ -210,7 +203,11 @@ int main(int argc, char** argv){
   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, get_one_option)))
+#ifndef DBUG_OFF
+  opt_debug= "d:t:O,/tmp/ndb_show_tables.trace";
+#endif
+  if ((ho_error=handle_options(&argc, &argv, my_long_options,
+			       ndb_std_get_one_option)))
     return NDBT_ProgramExit(NDBT_WRONGARGS);
   _tabname = argv[0];
 
diff --git a/ndb/tools/restore/restore_main.cpp b/ndb/tools/restore/restore_main.cpp
index 326020d7118..93c40d31adb 100644
--- a/ndb/tools/restore/restore_main.cpp
+++ b/ndb/tools/restore/restore_main.cpp
@@ -109,8 +109,10 @@ static my_bool
 get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
 	       char *argument)
 {
-  ndb_std_get_one_option(optid, opt, argument ? argument :
-			 "d:t:O,/tmp/ndb_restore.trace");
+#ifndef DBUG_OFF
+  opt_debug= "d:t:O,/tmp/ndb_restore.trace";
+#endif
+  ndb_std_get_one_option(optid, opt, argument);
   switch (optid) {
   case 'n':
     if (ga_nodeId == 0)
diff --git a/ndb/tools/select_all.cpp b/ndb/tools/select_all.cpp
index a3d07e3938b..baa18db1ebd 100644
--- a/ndb/tools/select_all.cpp
+++ b/ndb/tools/select_all.cpp
@@ -85,13 +85,6 @@ static void usage()
   my_print_help(my_long_options);
   my_print_variables(my_long_options);
 }
-static my_bool
-get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
-	       char *argument)
-{
-  return ndb_std_get_one_option(optid, opt, argument ? argument :
-				"d:t:O,/tmp/ndb_select_all.trace");
-}
 
 int main(int argc, char** argv){
   NDB_INIT(argv[0]);
@@ -99,7 +92,11 @@ int main(int argc, char** argv){
   load_defaults("my",load_default_groups,&argc,&argv);
   const char* _tabname;
   int ho_error;
-  if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))
+#ifndef DBUG_OFF
+  opt_debug= "d:t:O,/tmp/ndb_select_all.trace";
+#endif
+  if ((ho_error=handle_options(&argc, &argv, my_long_options,
+			       ndb_std_get_one_option)))
     return NDBT_ProgramExit(NDBT_WRONGARGS);
   if ((_tabname = argv[0]) == 0) {
     usage();
diff --git a/ndb/tools/select_count.cpp b/ndb/tools/select_count.cpp
index 41e66c8b367..6fa3c77f15a 100644
--- a/ndb/tools/select_count.cpp
+++ b/ndb/tools/select_count.cpp
@@ -60,20 +60,17 @@ static void usage()
   my_print_help(my_long_options);
   my_print_variables(my_long_options);
 }
-static my_bool
-get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
-	       char *argument)
-{
-  return ndb_std_get_one_option(optid, opt, argument ? argument :
-				"d:t:O,/tmp/ndb_select_count.trace");
-}
 
 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, get_one_option)))
+#ifndef DBUG_OFF
+  opt_debug= "d:t:O,/tmp/ndb_select_count.trace";
+#endif
+  if ((ho_error=handle_options(&argc, &argv, my_long_options,
+			       ndb_std_get_one_option)))
     return NDBT_ProgramExit(NDBT_WRONGARGS);
   if (argc < 1) {
     usage();
diff --git a/ndb/tools/waiter.cpp b/ndb/tools/waiter.cpp
index cc6a21428c8..db90bd8bd90 100644
--- a/ndb/tools/waiter.cpp
+++ b/ndb/tools/waiter.cpp
@@ -60,24 +60,19 @@ static void usage()
   my_print_variables(my_long_options);
 }
 
-static my_bool
-get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
-	       char *argument)
-{
-  return ndb_std_get_one_option(optid, opt, argument ? argument :
-				"d:t:O,/tmp/ndb_drop_table.trace");
-}
-
 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;
-  if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))
+#ifndef DBUG_OFF
+  opt_debug= "d:t:O,/tmp/ndb_waiter.trace";
+#endif
+  if ((ho_error=handle_options(&argc, &argv, my_long_options,
+			       ndb_std_get_one_option)))
     return NDBT_ProgramExit(NDBT_WRONGARGS);
 
-  char buf[255];
   _hostName = argv[0];
 
   if (_hostName == 0)