diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-23 15:22:21 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-23 15:22:21 +0400 |
| commit | 2dc132b209ef375d7d36a41a2429be001d8e5f45 (patch) | |
| tree | 9a94748e3f29d58645ae7979faaf09464080033d /sql/ha_ndbcluster_binlog.cc | |
| parent | f3d58bae2011dc043d75268a98e65731da622603 (diff) | |
| parent | 75116feb4b8976df3078f288f31fec7f46462461 (diff) | |
| download | mariadb-git-2dc132b209ef375d7d36a41a2429be001d8e5f45.tar.gz | |
Merge from mysql-next-mr.
Diffstat (limited to 'sql/ha_ndbcluster_binlog.cc')
| -rw-r--r-- | sql/ha_ndbcluster_binlog.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc index d06dc47f91b..08c14e3d8c4 100644 --- a/sql/ha_ndbcluster_binlog.cc +++ b/sql/ha_ndbcluster_binlog.cc @@ -3663,9 +3663,11 @@ pthread_handler_t ndb_binlog_thread_func(void *arg) ndb_binlog_thread_running= -1; pthread_mutex_unlock(&injector_mutex); pthread_cond_signal(&injector_cond); + + DBUG_LEAVE; // Must match DBUG_ENTER() my_thread_end(); pthread_exit(0); - DBUG_RETURN(NULL); + return NULL; // Avoid compiler warnings } lex_start(thd); @@ -4376,10 +4378,11 @@ err: (void) pthread_cond_signal(&injector_cond); DBUG_PRINT("exit", ("ndb_binlog_thread")); - my_thread_end(); + DBUG_LEAVE; // Must match DBUG_ENTER() + my_thread_end(); pthread_exit(0); - DBUG_RETURN(NULL); + return NULL; // Avoid compiler warnings } bool |