bzr commit into mysql-5.1 branch (msvensson:3214)

[Magnus Svensson]

#At file:///home/msvensson/mysql/6.4/ based on
revid:msvensson@stripped

 3214 Magnus Svensson	2009-01-14 [merge]
      Merge
modified:
  storage/ndb/test/tools/log_listner.cpp

=== modified file 'storage/ndb/test/tools/log_listner.cpp'
--- a/storage/ndb/test/tools/log_listner.cpp	2008-08-21 06:37:42 +0000
+++ b/storage/ndb/test/tools/log_listner.cpp	2009-01-14 14:12:12 +0000
@@ -5,15 +5,11 @@
 
 static struct my_option my_long_options[] =
 {
-  NDB_STD_OPTS("ndb_logevent_listen"),
+  NDB_STD_OPTS("eventlog"),
   { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
 static void usage()
 {
-  char desc[] = 
-    "tabname\n"\
-    "This program list all properties of table(s) in NDB Cluster.\n"\
-    "  ex: desc T1 T2 T4\n";
   ndb_std_print_version();
   my_print_help(my_long_options);
   my_print_variables(my_long_options);
@@ -38,7 +34,7 @@ main(int argc, char** argv)
   load_defaults("my",load_default_groups,&argc,&argv);
   int ho_error;
 #ifndef DBUG_OFF
-  opt_debug= "d:t:O,/tmp/ndb_desc.trace";
+  opt_debug= "d:t:O,/tmp/eventlog.trace";
 #endif
   if ((ho_error=handle_options(&argc, &argv, my_long_options, 
 			       ndb_std_get_one_option)))