ndb

  Add support/test for using my.cnf [cluster_config]

2 files changed, 23 insertions, 4 deletions

diff --git a/ndb/src/mgmsrv/InitConfigFileParser.cpp b/ndb/src/mgmsrv/InitConfigFileParser.cpp
index 00c094f83ad..233458ddf83 100644
--- a/ndb/src/mgmsrv/InitConfigFileParser.cpp
+++ b/ndb/src/mgmsrv/InitConfigFileParser.cpp
@@ -843,7 +843,7 @@ InitConfigFileParser::parse_mycnf()
   }
 
   
-  Context ctx(m_info); 
+  Context ctx(m_info, m_errstream); 
   const char *groups[]= { "cluster_config", 0 };
   if (load_defaults(options, groups))
     goto end;
diff --git a/ndb/tools/ndb_config.cpp b/ndb/tools/ndb_config.cpp
index 457021a4ec4..c7c87f8cc37 100644
--- a/ndb/tools/ndb_config.cpp
+++ b/ndb/tools/ndb_config.cpp
@@ -41,6 +41,7 @@ static const char * g_host = 0;
 static const char * g_field_delimiter=",";
 static const char * g_row_delimiter=" ";
 static const char * g_config_file = 0;
+static int g_mycnf = 0;
 
 int g_print_full_config, opt_ndb_shm;
 my_bool opt_core;
@@ -94,6 +95,9 @@ static struct my_option my_long_options[] =
   { "config-file", 256, "Path to config.ini",
     (gptr*) &g_config_file, (gptr*) &g_config_file,
     0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  { "mycnf", 256, "Read config from my.cnf",
+    (gptr*) &g_mycnf, (gptr*) &g_mycnf,
+    0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
 
@@ -163,11 +167,16 @@ main(int argc, char** argv){
 
   ndb_mgm_configuration * conf = 0;
 
-  if (g_config_file)
+  if (g_config_file || g_mycnf)
     conf = load_configuration();
   else
     conf = fetch_configuration();
 
+  if (conf == 0)
+  {
+    return -1;
+  }
+
   Vector<Apply*> select_list;
   Vector<Match*> where_clause;
 
@@ -437,10 +446,20 @@ ndb_mgm_configuration*
 load_configuration()
 {  
   InitConfigFileParser parser(stderr);
+  if (g_config_file)
+  {
+    if (g_verbose)
+      fprintf(stderr, "Using config.ini : %s", g_config_file);
+    
+    Config* conf = parser.parseConfig(g_config_file);
+    if (conf)
+      return conf->m_configValues;
+  }
+  
   if (g_verbose)
-    fprintf(stderr, "Using config.ini : %s", g_config_file);
+    fprintf(stderr, "Using my.cnf");
   
-  Config* conf = parser.parseConfig(g_config_file);
+  Config* conf = parser.parse_mycnf();
   if (conf)
     return conf->m_configValues;