diff options
author | Olivier Bertrand <bertrandop@gmail.com> | 2014-09-02 01:40:15 +0200 |
---|---|---|
committer | Olivier Bertrand <bertrandop@gmail.com> | 2014-09-02 01:40:15 +0200 |
commit | 7c1af793fc57e711fb0c8fdd12a3de5e45ad2bf7 (patch) | |
tree | 1ac86d3b7d01bdbd784e6a4284939891017136f7 /storage/connect/valblk.cpp | |
parent | 16de35114eabca16b60849989244ed491cbd3fda (diff) | |
download | mariadb-git-7c1af793fc57e711fb0c8fdd12a3de5e45ad2bf7.tar.gz |
- Initialise min/max buffer to 0 to avoid valgrind complaining
that uninitialised characters be written in op file.
modified:
storage/connect/tabdos.cpp
- Typo
modified:
storage/connect/filamap.cpp
storage/connect/filamdbf.cpp
storage/connect/filamdbf.h
storage/connect/valblk.cpp
storage/connect/xindex.cpp
Diffstat (limited to 'storage/connect/valblk.cpp')
-rw-r--r-- | storage/connect/valblk.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/valblk.cpp b/storage/connect/valblk.cpp index e435a49cbd2..3827deec43d 100644 --- a/storage/connect/valblk.cpp +++ b/storage/connect/valblk.cpp @@ -827,12 +827,12 @@ void CHRBLK::SetValue(PVBLK pv, int n1, int n2) longjmp(g->jumper[g->jump_level], Type); } // endif Type - if (!(b = pv->IsNull(n2) && Nullable)) + if (!(b = pv->IsNull(n2))) memcpy(Chrp + n1 * Long, ((CHRBLK*)pv)->Chrp + n2 * Long, Long); else Reset(n1); - SetNull(n1, b); + SetNull(n1, b && Nullable); } // end of SetValue /***********************************************************************/ |