summaryrefslogtreecommitdiff
path: root/storage/innobase/rem/rem0rec.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-05-03 20:14:09 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-05-03 20:14:09 +0300
commitb6f4cccd191f7d98306db9ebc6e8667ec9e1ec79 (patch)
treef530d85bd1ca8b3cb45f6b6d2b0e1e2ac6b24451 /storage/innobase/rem/rem0rec.cc
parent779fb636daf4c127dbb90f75bab004ac1bbe12df (diff)
parentce195987c3c995470992f16ca7a985796d6b65a6 (diff)
downloadmariadb-git-b6f4cccd191f7d98306db9ebc6e8667ec9e1ec79.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/rem/rem0rec.cc')
-rw-r--r--storage/innobase/rem/rem0rec.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/storage/innobase/rem/rem0rec.cc b/storage/innobase/rem/rem0rec.cc
index 8bd6c3faa98..f7f11d012fd 100644
--- a/storage/innobase/rem/rem0rec.cc
+++ b/storage/innobase/rem/rem0rec.cc
@@ -1095,9 +1095,7 @@ rec_get_converted_size_comp_prefix_low(
col = dict_field_get_col(field);
#ifdef UNIV_DEBUG
- dtype_t* type;
-
- type = dfield_get_type(&fields[i]);
+ const dtype_t* type = dfield_get_type(&fields[i]);
if (dict_index_is_spatial(index)) {
if (DATA_GEOMETRY_MTYPE(col->mtype) && i == 0) {
ut_ad(type->prtype & DATA_GIS_MBR);