Commit 9a5522ca authored by unknown's avatar unknown

Merge mysql.com:/extern/mysql/bk/mysql-5.0

into  mysql.com:/extern/mysql/work/bug15658/mysql-5.0

parents 663fe664 2e60e21d
...@@ -196,6 +196,9 @@ int main(int argc, char** argv) ...@@ -196,6 +196,9 @@ int main(int argc, char** argv)
NDB_INIT(argv[0]); 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; int ho_error;
#ifndef DBUG_OFF #ifndef DBUG_OFF
opt_debug= "d:t:O,/tmp/ndb_mgmd.trace"; opt_debug= "d:t:O,/tmp/ndb_mgmd.trace";
...@@ -218,9 +221,6 @@ start: ...@@ -218,9 +221,6 @@ start:
global_mgmt_server_check = 1; global_mgmt_server_check = 1;
const char *load_default_groups[]= { "mysql_cluster","ndb_mgmd",0 };
load_defaults("my",load_default_groups,&argc,&argv);
if (opt_interactive || if (opt_interactive ||
opt_non_interactive || opt_non_interactive ||
g_print_full_config) { g_print_full_config) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment