database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-03 20:43:11 +03:00
Code Activity

merge

Browse Source
This commit is contained in:
joreland@mysql.com
2004-11-22 07:59:09 +01:00
parent a50528455f 1da01ddb5d
commit e43f95e6be
120 changed files with 2615 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ndb/src/ndbapi/NdbScanOperation.cpp
View File

@@ -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,