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 | 069d78c06714233dcdc6011fa3262a54df6a1ed4 (patch) | |
| tree | 9a94748e3f29d58645ae7979faaf09464080033d /sql/ha_ndbcluster.cc | |
| parent | 40c0ae812965d86406f8e44fc0c4af0914858d46 (diff) | |
| parent | 2f5413ebc5a47ed45abe0d3c660cfbf673c666e2 (diff) | |
| download | mariadb-git-069d78c06714233dcdc6011fa3262a54df6a1ed4.tar.gz | |
Merge from mysql-next-mr.
Diffstat (limited to 'sql/ha_ndbcluster.cc')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 2a73ac5d906..c30ed826bf5 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -9523,9 +9523,11 @@ ndb_util_thread_fail: pthread_cond_signal(&COND_ndb_util_ready); pthread_mutex_unlock(&LOCK_ndb_util_thread); DBUG_PRINT("exit", ("ndb_util_thread")); + + DBUG_LEAVE; // Must match DBUG_ENTER() my_thread_end(); pthread_exit(0); - DBUG_RETURN(NULL); + return NULL; // Avoid compiler warnings } /* |