bzr commit into mysql-5.1 branch (msvensson:3036) WL#4350

[Magnus Svensson]

#At file:///home/msvensson/mysql/6.4-wl4350/

 3036 Magnus Svensson	2008-11-06
      WL#4350 
      - Add command line parameter --verbose that will turn
        on output from g_eventLogger->debug()
modified:
  storage/ndb/src/mgmsrv/MgmtSrvr.cpp
  storage/ndb/src/mgmsrv/MgmtSrvr.hpp
  storage/ndb/src/mgmsrv/main.cpp

=== modified file 'storage/ndb/src/mgmsrv/MgmtSrvr.cpp'
--- a/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2008-10-28 15:25:34 +0000
+++ b/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2008-11-06 10:38:08 +0000
@@ -610,6 +610,9 @@ MgmtSrvr::setClusterLog(const Config* co
 
   if (m_opts.non_interactive)
     g_eventLogger->createConsoleHandler();
+
+  if (m_opts.verbose)
+    g_eventLogger->enable(Logger::LL_DEBUG);
 }
 
 

=== modified file 'storage/ndb/src/mgmsrv/MgmtSrvr.hpp'
--- a/storage/ndb/src/mgmsrv/MgmtSrvr.hpp	2008-10-27 11:13:34 +0000
+++ b/storage/ndb/src/mgmsrv/MgmtSrvr.hpp	2008-11-06 10:38:08 +0000
@@ -131,6 +131,7 @@ public:
     int no_nodeid_checks;
     int print_full_config;
     const char* datadir;
+    int verbose;
   };
 
   MgmtSrvr(); // Not implemented

=== modified file 'storage/ndb/src/mgmsrv/main.cpp'
--- a/storage/ndb/src/mgmsrv/main.cpp	2008-10-21 12:41:59 +0000
+++ b/storage/ndb/src/mgmsrv/main.cpp	2008-11-06 10:38:08 +0000
@@ -119,6 +119,10 @@ static struct my_option my_long_options[
     "Data directory for this node",
     (uchar**) &opts.datadir, (uchar**) &opts.datadir, 0,
     GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
+  { "verbose", 'v',
+    "Write more log messages",
+    (uchar**) &opts.verbose, (uchar**) &opts.verbose, 0,
+    GET_BOOL, NO_ARG, 0, 0, 1, 0, 0, 0 },
   { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
 
@@ -159,6 +163,9 @@ int main(int argc, char** argv)
   /* Output to console initially */
   g_eventLogger->createConsoleHandler();
 
+  if (opts.verbose)
+    g_eventLogger->enable(Logger::LL_DEBUG);
+
   if (opts.mycnf && opts.config_filename)
   {
     g_eventLogger->error("Both --mycnf and -f is not supported");