summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-03-20 21:41:39 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2020-03-20 21:41:39 +0200
commitfd5c36bed5de65e85900c9fc9f0ed2092c4b38c5 (patch)
tree947173e9120d9726335b3342ee5bcbb83e0c9985
parent44298e4dea39280187c587c6e776ce8d04e350de (diff)
downloadmariadb-git-fd5c36bed5de65e85900c9fc9f0ed2092c4b38c5.tar.gz
MDEV-21959: Fix a type mismatch on 64-bit systems
-rw-r--r--sql/field.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc
index 196041c979e..6153ad64fca 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -9043,7 +9043,7 @@ int Field_geom::store(const char *from, size_t length, CHARSET_INFO *cs)
if (!tab_name)
tab_name= "";
wkt.set_charset(&my_charset_latin1);
- if (!(geom= Geometry::construct(&buffer, from, length)) ||
+ if (!(geom= Geometry::construct(&buffer, from, uint32(length))) ||
geom->as_wkt(&wkt, &dummy))
goto err;