diff options
| author | pekka@mysql.com <> | 2004-12-22 13:38:16 +0100 |
|---|---|---|
| committer | pekka@mysql.com <> | 2004-12-22 13:38:16 +0100 |
| commit | 60b79f2b7e6d000bb25f8bea8906c4eddb8f450f (patch) | |
| tree | 9726d129bef0949a141013b9f4373f68a232a14d /ndb | |
| parent | e53b446a735d04b5f94e754f833d1480eb17874a (diff) | |
| parent | f57153fe8176df061c142c84e7eec2990d66e85e (diff) | |
| download | mariadb-git-60b79f2b7e6d000bb25f8bea8906c4eddb8f450f.tar.gz | |
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/src/ndbapi/NdbConnection.cpp | 7 | ||||
| -rw-r--r-- | ndb/src/ndbapi/NdbOperationDefine.cpp | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ndb/src/ndbapi/NdbConnection.cpp b/ndb/src/ndbapi/NdbConnection.cpp index e2a1b6d6ab9..0a1c7303771 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 { diff --git a/ndb/src/ndbapi/NdbOperationDefine.cpp b/ndb/src/ndbapi/NdbOperationDefine.cpp index 35abb15b00d..c4aaffb3119 100644 --- a/ndb/src/ndbapi/NdbOperationDefine.cpp +++ b/ndb/src/ndbapi/NdbOperationDefine.cpp @@ -528,7 +528,9 @@ NdbOperation::setValue( const NdbColumnImpl* tAttrInfo, CHARSET_INFO* cs = tAttrInfo->m_cs; // invalid data can crash kernel if (cs != NULL && - (*cs->cset->well_formed_len)(cs, + // fast fix bug#7340 + tAttrInfo->m_type != NdbDictionary::Column::Text && + (*cs->cset->well_formed_len)(cs, aValue, aValue + sizeInBytes, sizeInBytes) != sizeInBytes) { |