Commit cfb7ac76 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
ndb/include/util/ndb_opts.h:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/vm/Emulator.cpp:
  Auto merged
ndb/src/kernel/vm/Emulator.hpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/tools/Makefile.am:
  Auto merged
ndb/tools/ndb_config.cpp:
  Auto merged
ndb/tools/restore/consumer_restore.cpp:
  Auto merged
ndb/tools/restore/restore_main.cpp:
  Auto merged
parents dd45e416 7b2aacb7

ndb/tools/restore/restore_main.cpp

+1 −2
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ free_data_callback() 
    g_consumers[i]->tuple_free();

}



const char * g_connect_string = 0;

static void exitHandler(int code)

{

  NDBT_ProgramExit(code);
@@ -238,8 +239,6 @@ static void exitHandler(int code) 
    exit(code);

}



const char * g_connect_string = 0;



int

main(int argc, char** argv)

{