diff options
| author | unknown <serg@sergbook.mysql.com> | 2004-12-31 18:01:00 +0100 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2004-12-31 18:01:00 +0100 |
| commit | 9c92a25524183a88c46474bab10313eb8b9edbab (patch) | |
| tree | 73d60625dbb0c5e0d654eb089086cb4785040288 /ndb/src/ndbapi/NdbConnection.cpp | |
| parent | 6b393398744ec96a8f912b88d3a880114038aa12 (diff) | |
| parent | 31c4511d1794079f3951d741901cbd4440da4e5c (diff) | |
| download | mariadb-git-9c92a25524183a88c46474bab10313eb8b9edbab.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
mysql-test/r/user_limits.result:
Auto merged
mysql-test/t/user_limits.test:
Auto merged
Diffstat (limited to 'ndb/src/ndbapi/NdbConnection.cpp')
| -rw-r--r-- | ndb/src/ndbapi/NdbConnection.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ndb/src/ndbapi/NdbConnection.cpp b/ndb/src/ndbapi/NdbConnection.cpp index 29959a4ed7e..aa4f68a85b4 100644 --- a/ndb/src/ndbapi/NdbConnection.cpp +++ b/ndb/src/ndbapi/NdbConnection.cpp @@ -361,11 +361,10 @@ NdbConnection::execute(ExecType aTypeOfExec, if (executeNoBlobs(tExecType, abortOption, forceSend) == -1) ret = -1; -#ifndef VM_TRACE - // can happen in complex abort cases - theFirstOpInList = theLastOpInList = NULL; -#else +#ifdef ndb_api_crash_on_complex_blob_abort assert(theFirstOpInList == NULL && theLastOpInList == NULL); +#else + theFirstOpInList = theLastOpInList = NULL; #endif { |