diff options
author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-11-22 11:07:52 +0000 |
---|---|---|
committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-11-22 11:07:52 +0000 |
commit | 5b2d1a65b22586918f4059fd22be65498aa888dd (patch) | |
tree | 75fd8be69bce16064d5dcae64730e45cf2f95fe9 /ndb/src/kernel/vm/Configuration.cpp | |
parent | 404b1524857330187a01209465758e2e02ad8bdb (diff) | |
parent | 6aebd056cfa68da39f0a1d6a66fc809e55d91ced (diff) | |
download | mariadb-git-5b2d1a65b22586918f4059fd22be65498aa888dd.tar.gz |
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin
ndb/src/kernel/vm/Configuration.cpp:
Auto merged
ndb/src/mgmclient/main.cpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
ndb/tools/restore/restore_main.cpp:
Auto merged
ndb/tools/select_all.cpp:
Auto merged
ndb/tools/waiter.cpp:
Auto merged
Diffstat (limited to 'ndb/src/kernel/vm/Configuration.cpp')
-rw-r--r-- | ndb/src/kernel/vm/Configuration.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ndb/src/kernel/vm/Configuration.cpp b/ndb/src/kernel/vm/Configuration.cpp index 3b7d6179dce..31853b7a3b7 100644 --- a/ndb/src/kernel/vm/Configuration.cpp +++ b/ndb/src/kernel/vm/Configuration.cpp @@ -107,7 +107,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), bool Configuration::init(int argc, char** argv) { - const char *load_default_groups[]= { "ndbd",0 }; + const char *load_default_groups[]= { "mysql_cluster","ndbd",0 }; load_defaults("my",load_default_groups,&argc,&argv); int ho_error; |