diff options
| author | unknown <joreland@mysql.com> | 2004-11-22 07:59:09 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-11-22 07:59:09 +0100 |
| commit | 3ef57e28495d2f309a982ea8f3c42306d67f76bd (patch) | |
| tree | 484ebccb1a98aef39b43f54377874f4550f8e401 /ndb/src/ndbapi/NdbScanOperation.cpp | |
| parent | 9fcc0dc73e623cbbe9604ac7f0b432a0f5a00020 (diff) | |
| parent | 2c15c8e33237c6bebef43825294f85eaba9385b3 (diff) | |
| download | mariadb-git-3ef57e28495d2f309a982ea8f3c42306d67f76bd.tar.gz | |
merge
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
Diffstat (limited to 'ndb/src/ndbapi/NdbScanOperation.cpp')
| -rw-r--r-- | ndb/src/ndbapi/NdbScanOperation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ndb/src/ndbapi/NdbScanOperation.cpp b/ndb/src/ndbapi/NdbScanOperation.cpp index 7af7a876ef2..14b7d4fbed4 100644 --- a/ndb/src/ndbapi/NdbScanOperation.cpp +++ b/ndb/src/ndbapi/NdbScanOperation.cpp @@ -1064,7 +1064,7 @@ NdbIndexScanOperation::setBound(const NdbColumnImpl* tAttrInfo, Uint64 xfrmData[1001]; if (cs != NULL && aValue != NULL) { // current limitation: strxfrm does not increase length - assert(cs->strxfrm_multiply == 1); + assert(cs->strxfrm_multiply <= 1); ((Uint32*)xfrmData)[len >> 2] = 0; unsigned n = (*cs->coll->strnxfrm)(cs, |