summaryrefslogtreecommitdiff
path: root/storage/connect/array.cpp
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2014-09-30 12:59:24 +0200
committerOlivier Bertrand <bertrandop@gmail.com>2014-09-30 12:59:24 +0200
commit38c3fd2099577b932999766df41c77a81429fdc4 (patch)
treeac35245a4aeaa8fb75434d3e16f2f513ef9ba3af /storage/connect/array.cpp
parentdd5eb7ae6781e963c6eb20049087c3f3c7e7b510 (diff)
downloadmariadb-git-38c3fd2099577b932999766df41c77a81429fdc4.tar.gz
- Fix MDEV-6802 in a clean way.
Add an union in the PARM structure to contain int values Use a cast to ptrdiff_t in MAPFAM/MXPFAM::InitDelete required by some compilers modified: storage/connect/array.cpp storage/connect/filamap.cpp storage/connect/filamtxt.cpp storage/connect/global.h - Suppress some GCC warnings modified: storage/connect/array.cpp storage/connect/filter.cpp storage/connect/tabdos.cpp storage/connect/tabmysql.cpp storage/connect/value.cpp
Diffstat (limited to 'storage/connect/array.cpp')
-rw-r--r--storage/connect/array.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/connect/array.cpp b/storage/connect/array.cpp
index 2519191f6e6..a2ee902bc59 100644
--- a/storage/connect/array.cpp
+++ b/storage/connect/array.cpp
@@ -130,7 +130,7 @@ PARRAY MakeValueArray(PGLOBAL g, PPARM pp)
break;
case TYPE_VOID:
// Integer stored inside pp->Value
- par->AddValue(g, (int)(uintptr_t)parmp->Value);
+ par->AddValue(g, parmp->Intval);
break;
} // endswitch valtyp
@@ -609,13 +609,13 @@ int ARRAY::Convert(PGLOBAL g, int k, PVAL vp)
Size = Nval;
Nval = 0;
- Vblp = Valblk->Allocate(g, Type, Len, 0, Size);
+ Vblp = Valblk->Allocate(g, Type, Len, prec, Size);
if (!Valblk->GetMemp())
// The error message was built by PlgDBalloc
return TYPE_ERROR;
else
- Value = AllocateValue(g, Type, Len, 0, NULL);
+ Value = AllocateValue(g, Type, Len, prec, NULL);
/*********************************************************************/
/* Converting STRING to DATE can be done according to date format. */