diff options
| author | unknown <mysqldev@mysql.com> | 2005-02-03 17:00:51 +0100 |
|---|---|---|
| committer | unknown <mysqldev@mysql.com> | 2005-02-03 17:00:51 +0100 |
| commit | a5463c252aaa5f2c6d13a0dbf8864f88ff9d6d40 (patch) | |
| tree | bda54d6a666bd0b656d95c077b4dc4b22a7b96e3 /ndb/test/tools | |
| parent | 8e279c4cf8e3bba242ed7e1790227ff9a4c5d966 (diff) | |
| parent | 355f7128c4e8815a5dc13377b1689746bd690d0d (diff) | |
| download | mariadb-git-a5463c252aaa5f2c6d13a0dbf8864f88ff9d6d40.tar.gz | |
corrected automerge error
configure.in:
Auto merged
include/my_global.h:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
ndb/test/ndbapi/flexAsynch.cpp:
Auto merged
ndb/test/ndbapi/flexBench.cpp:
Auto merged
ndb/test/ndbapi/flexHammer.cpp:
Auto merged
ndb/test/ndbapi/flexTT.cpp:
Auto merged
ndb/test/ndbapi/flex_bench_mysql.cpp:
Auto merged
ndb/test/src/NDBT_Test.cpp:
corrected automerge error
Diffstat (limited to 'ndb/test/tools')
| -rw-r--r-- | ndb/test/tools/transproxy.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ndb/test/tools/transproxy.cpp b/ndb/test/tools/transproxy.cpp index 88267801172..28a621fa584 100644 --- a/ndb/test/tools/transproxy.cpp +++ b/ndb/test/tools/transproxy.cpp @@ -291,7 +291,6 @@ extern "C" void* copyrun_C(void* copy) { ((Copy*) copy)->run(); - NdbThread_Exit(0); return 0; } @@ -322,7 +321,6 @@ extern "C" void* connrun_C(void* conn) { ((Conn*) conn)->run(); - NdbThread_Exit(0); return 0; } |