diff options
author | unknown <serg@serg.mylan> | 2005-04-06 23:12:10 +0200 |
---|---|---|
committer | unknown <serg@serg.mylan> | 2005-04-06 23:12:10 +0200 |
commit | 1fcebd5549f1055954254fc77160a424177351ad (patch) | |
tree | 263f1e6f72b80f3bf548474ea002eb8969128eb3 /ndb/src/kernel/blocks/dbtup | |
parent | 3960c84f1202cf2e47427df1ca869a054a67f829 (diff) | |
download | mariadb-git-1fcebd5549f1055954254fc77160a424177351ad.tar.gz |
after merge fix
mysql-test/r/user_var.result:
after merge fixes - old (erroneous) results restored.
Should be corrected when the fix is applied
mysql-test/t/user_var.test:
after merge fixes - old (erroneous) results restored.
Should be corrected when the fix is applied
Diffstat (limited to 'ndb/src/kernel/blocks/dbtup')
-rw-r--r-- | ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp b/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp index c3f85cdebd5..3170d23499a 100644 --- a/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp +++ b/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp @@ -813,6 +813,7 @@ Dbtup::updateFixedSizeTHManyWordNotNULL(Uint32* inBuffer, ndbrequire(i < regTabPtr->noOfCharsets); // not const in MySQL CHARSET_INFO* cs = regTabPtr->charsetArray[i]; + int not_used; const char* ssrc = (const char*)&inBuffer[tInBufIndex + 1]; Uint32 lb, len; if (! NdbSqlUtil::get_var_length(typeId, ssrc, bytes, lb, len)) { @@ -822,7 +823,7 @@ Dbtup::updateFixedSizeTHManyWordNotNULL(Uint32* inBuffer, } // fast fix bug#7340 if (typeId != NDB_TYPE_TEXT && - (*cs->cset->well_formed_len)(cs, ssrc + lb, ssrc + lb + len, ZNIL) != len) { + (*cs->cset->well_formed_len)(cs, ssrc + lb, ssrc + lb + len, ZNIL, ¬_used) != len) { ljam(); terrorCode = ZINVALID_CHAR_FORMAT; return false; |