diff options
| author | unknown <pekka@mysql.com> | 2004-11-18 11:48:21 +0100 |
|---|---|---|
| committer | unknown <pekka@mysql.com> | 2004-11-18 11:48:21 +0100 |
| commit | 9615e9becf2af5d3f5184115e390d1a10c0ce261 (patch) | |
| tree | 12cadad41d9095050837c57acdf2984d556d5364 /ndb/src/ndbapi | |
| parent | 03d6e2453b3a421a6ab97ec1abd84cc22c9fa158 (diff) | |
| download | mariadb-git-9615e9becf2af5d3f5184115e390d1a10c0ce261.tar.gz | |
ndb: charset fix from Bar (strxfrm_multiply can be 0)
ndb/src/common/util/NdbSqlUtil.cpp:
charset fix from Bar (strxfrm_multiply can be 0)
ndb/src/ndbapi/NdbIndexOperation.cpp:
charset fix from Bar (strxfrm_multiply can be 0)
ndb/src/ndbapi/NdbOperationSearch.cpp:
charset fix from Bar (strxfrm_multiply can be 0)
ndb/src/ndbapi/NdbScanOperation.cpp:
charset fix from Bar (strxfrm_multiply can be 0)
Diffstat (limited to 'ndb/src/ndbapi')
| -rw-r--r-- | ndb/src/ndbapi/NdbIndexOperation.cpp | 2 | ||||
| -rw-r--r-- | ndb/src/ndbapi/NdbOperationSearch.cpp | 2 | ||||
| -rw-r--r-- | ndb/src/ndbapi/NdbScanOperation.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ndb/src/ndbapi/NdbIndexOperation.cpp b/ndb/src/ndbapi/NdbIndexOperation.cpp index 3f174a61b64..23af646c4c7 100644 --- a/ndb/src/ndbapi/NdbIndexOperation.cpp +++ b/ndb/src/ndbapi/NdbIndexOperation.cpp @@ -272,7 +272,7 @@ int NdbIndexOperation::equal_impl(const NdbColumnImpl* tAttrInfo, CHARSET_INFO* cs = tAttrInfo->m_cs; if (cs != 0) { // current limitation: strxfrm does not increase length - assert(cs->strxfrm_multiply == 1); + assert(cs->strxfrm_multiply <= 1); unsigned n = (*cs->coll->strnxfrm)(cs, (uchar*)xfrmData, sizeof(xfrmData), diff --git a/ndb/src/ndbapi/NdbOperationSearch.cpp b/ndb/src/ndbapi/NdbOperationSearch.cpp index 69b4e803acd..28a70abcb9b 100644 --- a/ndb/src/ndbapi/NdbOperationSearch.cpp +++ b/ndb/src/ndbapi/NdbOperationSearch.cpp @@ -142,7 +142,7 @@ NdbOperation::equal_impl(const NdbColumnImpl* tAttrInfo, CHARSET_INFO* cs = tAttrInfo->m_cs; if (cs != 0) { // current limitation: strxfrm does not increase length - assert(cs->strxfrm_multiply == 1); + assert(cs->strxfrm_multiply <= 1); unsigned n = (*cs->coll->strnxfrm)(cs, (uchar*)xfrmData, sizeof(xfrmData), diff --git a/ndb/src/ndbapi/NdbScanOperation.cpp b/ndb/src/ndbapi/NdbScanOperation.cpp index 373fec1a2b0..4b10ebb10cd 100644 --- a/ndb/src/ndbapi/NdbScanOperation.cpp +++ b/ndb/src/ndbapi/NdbScanOperation.cpp @@ -1091,7 +1091,7 @@ NdbIndexScanOperation::setBound(const NdbColumnImpl* tAttrInfo, Uint32 xfrmData[2000]; if (cs != NULL && aValue != NULL) { // current limitation: strxfrm does not increase length - assert(cs->strxfrm_multiply == 1); + assert(cs->strxfrm_multiply <= 1); unsigned n = (*cs->coll->strnxfrm)(cs, (uchar*)xfrmData, sizeof(xfrmData), |