diff options
| author | unknown <Justin.He/justin.he@dev3-240.dev.cn.tlan> | 2007-08-30 16:17:32 +0800 |
|---|---|---|
| committer | unknown <Justin.He/justin.he@dev3-240.dev.cn.tlan> | 2007-08-30 16:17:32 +0800 |
| commit | 2e081a2d8b83da72afdee01b3f2855b53f8d14bd (patch) | |
| tree | dbe53e1844dee62738f4e066a77830105fc0e96a /storage/ndb/tools | |
| parent | 4ad9539a24b5f92d94edc5d63f725ac2abd0dbe7 (diff) | |
| parent | b6621a44a43162e1c638ef00114fa39548c40c7b (diff) | |
| download | mariadb-git-2e081a2d8b83da72afdee01b3f2855b53f8d14bd.tar.gz | |
Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge
mysql-test/Makefile.am:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/tools/restore/Restore.cpp:
Auto merged
storage/ndb/tools/restore/restore_main.cpp:
Auto merged
mysql-test/suite/ndb/r/ndb_restore_compat.result:
Auto merged
mysql-test/suite/ndb/t/ndb_restore_compat.test:
Auto merged
Diffstat (limited to 'storage/ndb/tools')
| -rw-r--r-- | storage/ndb/tools/restore/restore_main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/ndb/tools/restore/restore_main.cpp b/storage/ndb/tools/restore/restore_main.cpp index c12dc4dd0e8..7db77524ad8 100644 --- a/storage/ndb/tools/restore/restore_main.cpp +++ b/storage/ndb/tools/restore/restore_main.cpp @@ -138,7 +138,7 @@ static struct my_option my_long_options[] = "(parallelism can be 1 to 1024)", (uchar**) &ga_nParallelism, (uchar**) &ga_nParallelism, 0, GET_INT, REQUIRED_ARG, 128, 1, 1024, 0, 1, 0 }, - { "print", OPT_PRINT, "Print data and log to stdout", + { "print", OPT_PRINT, "Print metadata, data and log to stdout", (uchar**) &_print, (uchar**) &_print, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 }, { "print_data", OPT_PRINT_DATA, "Print data to stdout", |