bk commit into 5.0 tree (msvensson:1.1962)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1962 05/09/06 09:42:02 msvensson@neptunus.(none) +15 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  ndb/tools/restore/restore_main.cpp
    1.33 05/09/06 09:41:57 msvensson@neptunus.(none) +0 -0
    Auto merged

  ndb/tools/restore/consumer_restore.cpp
    1.19 05/09/06 09:41:57 msvensson@neptunus.(none) +0 -0
    Auto merged

  ndb/tools/ndb_config.cpp
    1.8 05/09/06 09:41:57 msvensson@neptunus.(none) +0 -0
    Auto merged

  ndb/tools/Makefile.am
    1.21 05/09/06 09:41:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  ndb/src/mgmsrv/Services.cpp
    1.51 05/09/06 09:41:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.81 05/09/06 09:41:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  ndb/src/mgmsrv/ConfigInfo.cpp
    1.67 05/09/06 09:41:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  ndb/src/kernel/vm/Emulator.hpp
    1.8 05/09/06 09:41:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  ndb/src/kernel/vm/Emulator.cpp
    1.18 05/09/06 09:41:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  ndb/src/kernel/main.cpp
    1.53 05/09/06 09:41:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  ndb/src/kernel/error/ErrorReporter.cpp
    1.13 05/09/06 09:41:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
    1.18 05/09/06 09:41:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  ndb/include/util/ndb_opts.h
    1.13 05/09/06 09:41:56 msvensson@neptunus.(none) +0 -2
    Auto merged

  mysql-test/t/func_gconcat.test
    1.34 05/09/06 09:41:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/func_gconcat.result
    1.44 05/09/06 09:41:56 msvensson@neptunus.(none) +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0/RESYNC

--- 1.32/ndb/tools/restore/restore_main.cpp	2005-09-05 22:49:33 +02:00
+++ 1.33/ndb/tools/restore/restore_main.cpp	2005-09-06 09:41:57 +02:00
@@ -229,6 +229,7 @@
     g_consumers[i]->tuple_free();
 }
 
+const char * g_connect_string = 0;
 static void exitHandler(int code)
 {
   NDBT_ProgramExit(code);
@@ -237,8 +238,6 @@
   else
     exit(code);
 }
-
-const char * g_connect_string = 0;
 
 int
 main(int argc, char** argv)