bzr push into mysql-5.1-telco-7.0-spj branch (jonas:3217 to 3218)

[Jonas Oreland]

 3218 Jonas Oreland	2010-09-24
      ndb spj - adopt to collibri changes

    modified:
      storage/ndb/test/tools/hugoJoin.cpp
 3217 Jonas Oreland	2010-09-23 [merge]
      ndb - merge 70-main to 70-spj

    removed:
      storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.cpp
      storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp
      storage/ndb/test/tools/transproxy.cpp
    modified:
      include/config-win.h
      storage/ndb/include/portlib/NdbDir.hpp
      storage/ndb/include/portlib/NdbMem.h
      storage/ndb/include/portlib/NdbThread.h
      storage/ndb/include/util/NdbAutoPtr.hpp
      storage/ndb/include/util/azlib.h
      storage/ndb/src/common/portlib/NdbDir.cpp
      storage/ndb/src/common/util/azio.c
      storage/ndb/src/kernel/blocks/CMakeLists.txt
      storage/ndb/src/kernel/blocks/Makefile.am
      storage/ndb/src/kernel/blocks/ndbfs/AsyncIoThread.cpp
      storage/ndb/src/kernel/blocks/ndbfs/AsyncIoThread.hpp
      storage/ndb/src/kernel/blocks/ndbfs/Filename.cpp
      storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp
      storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
      storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp
      storage/ndb/src/kernel/blocks/ndbfs/Win32AsyncFile.cpp
      storage/ndb/src/kernel/blocks/ndbfs/Win32AsyncFile.hpp
      storage/ndb/src/mgmclient/CommandInterpreter.cpp
      storage/ndb/test/ndbapi/testIndexStat.cpp
      storage/ndb/test/run-test/files.cpp
      storage/ndb/test/tools/CMakeLists.txt
      storage/ndb/test/tools/Makefile.am
      storage/ndb/tools/restore/consumer_restore.cpp
=== modified file 'storage/ndb/test/tools/hugoJoin.cpp'
--- a/storage/ndb/test/tools/hugoJoin.cpp	2010-05-20 11:18:08 +0000
+++ b/storage/ndb/test/tools/hugoJoin.cpp	2010-09-24 08:13:18 +0000
@@ -80,7 +80,7 @@ static struct my_option my_long_options[
 
 static void short_usage_sub(void)
 {
-  ndb_short_usage_sub(my_progname, NULL);
+  ndb_short_usage_sub(NULL);
 }
 
 static void usage()
@@ -93,7 +93,7 @@ static void usage()
 
 int main(int argc, char** argv){
   NDB_INIT(argv[0]);
-  ndb_opt_set_usage_funcs(NULL, short_usage_sub, usage);
+  ndb_opt_set_usage_funcs(short_usage_sub, usage);
   load_defaults("my", load_default_groups, &argc, &argv);
   int ho_error;
   if ((ho_error=handle_options(&argc, &argv, my_long_options,


Attachment: [text/bzr-bundle] bzr/[e-mail]