diff options
author | unknown <mskold@mysql.com> | 2005-02-05 21:27:30 +0100 |
---|---|---|
committer | unknown <mskold@mysql.com> | 2005-02-05 21:27:30 +0100 |
commit | 2a05021541f428561a2f698a17dcf9e130f48d88 (patch) | |
tree | 12ef4ca3d1b440957a977aa5d777ed643b017ef9 /ndb/src/mgmclient/CommandInterpreter.cpp | |
parent | cdce11a32b3f7801e942bd14b29f233008e335b9 (diff) | |
parent | b23da8fa96601d9549595cfe910a21e063b9b023 (diff) | |
download | mariadb-git-2a05021541f428561a2f698a17dcf9e130f48d88.tar.gz |
Merge
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
Diffstat (limited to 'ndb/src/mgmclient/CommandInterpreter.cpp')
-rw-r--r-- | ndb/src/mgmclient/CommandInterpreter.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/ndb/src/mgmclient/CommandInterpreter.cpp b/ndb/src/mgmclient/CommandInterpreter.cpp index 286264e070f..0af3519abe8 100644 --- a/ndb/src/mgmclient/CommandInterpreter.cpp +++ b/ndb/src/mgmclient/CommandInterpreter.cpp @@ -457,10 +457,6 @@ event_thread_run(void* m) { NdbMgmHandle handle= *(NdbMgmHandle*)m; - my_thread_init(); - - DBUG_ENTER("event_thread_run"); - int filter[] = { 15, NDB_MGM_EVENT_CATEGORY_BACKUP, 0 }; int fd = ndb_mgm_listen_event(handle, filter); if (fd > 0) @@ -480,9 +476,7 @@ event_thread_run(void* m) do_event_thread= -1; } - my_thread_end(); - NdbThread_Exit(0); - return 0; + return NULL; } bool |