Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug27683

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug27683


storage/ndb/tools/restore/restore_main.cpp:
  Auto merged

storage/ndb/tools/restore/restore_main.cpp

@@ -138,7 +138,7 @@ static struct my_option my_long_options[] =
     "(parallelism can be 1 to 1024)", 
     (gptr*) &ga_nParallelism, (gptr*) &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",
     (gptr*) &_print, (gptr*) &_print, 0,
     GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
   { "print_data", OPT_PRINT_DATA, "Print data to stdout",