diff options
| author | unknown <monty@mysql.com> | 2005-05-20 16:14:35 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-05-20 16:14:35 +0300 |
| commit | 027c10f3bbc5ad54a104909f5587effe246d7ed5 (patch) | |
| tree | aa7fb9173589000beb4052d77262a95532b07c2e /ndb | |
| parent | 3034935a875d959c21af79d08fbda2a1d32f11c6 (diff) | |
| download | mariadb-git-027c10f3bbc5ad54a104909f5587effe246d7ed5.tar.gz | |
compatibility issues
Fixed errors reported by valgrind (some errors in NDB remains)
myisam/rt_split.c:
Added missing cast that caused problem on novell
(minor code cleanup)
ndb/src/ndbapi/Ndb.cpp:
Moved DBUG_ENTER to remove warning from DBUG library
sql/field_conv.cc:
Added test for valgrind/purify to avoid warning
sql/item_sum.cc:
Removed comment and added ASSERT as setup can't be called twice anymore
sql/sql_delete.cc:
Fixed wrong return value
sql/sql_parse.cc:
More debugging
sql/sql_select.cc:
Removed duplicate call to setup() which caused a memory leak
strings/my_vsnprintf.c:
Added support for '%c' (used when printing my_getopt errors)
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/src/ndbapi/Ndb.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ndb/src/ndbapi/Ndb.cpp b/ndb/src/ndbapi/Ndb.cpp index 5b1a33ce68f..c48e70f1d51 100644 --- a/ndb/src/ndbapi/Ndb.cpp +++ b/ndb/src/ndbapi/Ndb.cpp @@ -230,9 +230,10 @@ Remark: Disconnect all connections to the database. void Ndb::doDisconnect() { - DBUG_ENTER("Ndb::doDisconnect"); NdbTransaction* tNdbCon; CHECK_STATUS_MACRO_VOID; + /* DBUG_ENTER must be after CHECK_STATUS_MACRO_VOID because of 'return' */ + DBUG_ENTER("Ndb::doDisconnect"); Uint32 tNoOfDbNodes = theImpl->theNoOfDBnodes; Uint8 *theDBnodes= theImpl->theDBnodes; |