Commit a74f300f authored by unknown's avatar unknown
Browse files

Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 

into  mysql.com:/home/hartmut/projects/mysql/dev/teamtrees/mysql-5.0-ndb
parents 8946a1e7 53e153fd

ndb/src/cw/cpcd/main.cpp

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ int main(int argc, char** argv){ 


  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);

ndb/src/kernel/vm/Configuration.cpp

+4 −1
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ static const char* _nowait_nodes; 
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 @@ static void usage() 
{

  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 @@ static void usage() 
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;

ndb/src/mgmclient/main.cpp

+3 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ extern "C" int add_history(const char *command); /* From readline directory */ 
#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 @@ static void usage() 
{

  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 @@ int main(int argc, char** argv){ 
  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;

ndb/src/mgmsrv/main.cpp

+3 −1
Original line number Diff line number Diff line
@@ -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 @@ static void usage() 
{

  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 @@ int main(int argc, char** argv) 


  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;

ndb/tools/delete_all.cpp

+4 −1
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ static int clear_table(Ndb* pNdb, const NdbDictionary::Table* pTab, 


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 @@ static void usage() 
    "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