mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
unknown 2005-09-06 09:42:02 +02:00
commit cfb7ac7680
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ndb/tools/restore/restore_main.cpp
View file

@ -229,6 +229,7 @@ free_data_callback()
g_consumers[i]->tuple_free(); g_consumers[i]->tuple_free();
} }
const char * g_connect_string = 0;
static void exitHandler(int code) static void exitHandler(int code)
{ {
NDBT_ProgramExit(code); NDBT_ProgramExit(code);
@ -238,8 +239,6 @@ static void exitHandler(int code)
exit(code); exit(code);
} }
const char * g_connect_string = 0;
int int
main(int argc, char** argv) main(int argc, char** argv)
{ {