diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-04-07 20:19:25 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-04-07 20:19:25 +0200 |
| commit | 5fa93a136d8697f054c9614ea50687f613d0d32a (patch) | |
| tree | 2e02e9e3b74ff723fbc4d1328fb75dbb0d87f79a /sql/ha_ndbcluster.cc | |
| parent | f9d6463fdf09215fee71530693190abeedbbea66 (diff) | |
| parent | baf90cc0ce98b641ca64a934dd1315248b00b6e5 (diff) | |
| download | mariadb-git-5fa93a136d8697f054c9614ea50687f613d0d32a.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
Diffstat (limited to 'sql/ha_ndbcluster.cc')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index a60f8133d47..b22e09725ee 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -5822,6 +5822,7 @@ extern "C" pthread_handler_decl(ndb_util_thread_func, { thd->cleanup(); delete thd; + delete ndb; DBUG_RETURN(NULL); } @@ -5940,6 +5941,7 @@ extern "C" pthread_handler_decl(ndb_util_thread_func, thd->cleanup(); delete thd; + delete ndb; DBUG_PRINT("exit", ("ndb_util_thread")); my_thread_end(); pthread_exit(0); |