diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-11-25 02:27:02 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-11-25 02:27:02 +0200 |
| commit | a352372170815bebd65755bc5fff00fdf964cf9b (patch) | |
| tree | 64b87aad2e52257f0c6cb4d27336e0d1fb516494 /ndb/tools/desc.cpp | |
| parent | f88d01932f4a81682267e21022686d3dea4edb78 (diff) | |
| parent | 00899088a5f576721ecbf3ca235cdfcd691c8a0e (diff) | |
| download | mariadb-git-a352372170815bebd65755bc5fff00fdf964cf9b.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-join-5.0
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'ndb/tools/desc.cpp')
| -rw-r--r-- | ndb/tools/desc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ndb/tools/desc.cpp b/ndb/tools/desc.cpp index 8f7a2031ef0..c5e9efdfa8a 100644 --- a/ndb/tools/desc.cpp +++ b/ndb/tools/desc.cpp @@ -67,7 +67,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), int main(int argc, char** argv){ NDB_INIT(argv[0]); - const char *load_default_groups[]= { "ndb_tools",0 }; + const char *load_default_groups[]= { "mysql_cluster",0 }; load_defaults("my",load_default_groups,&argc,&argv); int ho_error; if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option))) |