summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-03-11 21:43:43 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2021-03-11 21:43:43 +0200
commit4c2b6be38e7c62d585b137ab9b3af4907a08a737 (patch)
tree96bfa6c74e077887f895fa03ea7dbe683a1e2c92
parentabe25c31a6edb8e0d966f914fbe920032cb66046 (diff)
downloadmariadb-git-4c2b6be38e7c62d585b137ab9b3af4907a08a737.tar.gz
One more try: Fix -Wconversion on GCC 4 to 9
-rw-r--r--storage/innobase/data/data0data.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/data/data0data.cc b/storage/innobase/data/data0data.cc
index a8a25ce9d29..14a0b3e19fd 100644
--- a/storage/innobase/data/data0data.cc
+++ b/storage/innobase/data/data0data.cc
@@ -688,7 +688,7 @@ dtuple_convert_big_rec(
goto skip_field;
}
- longest_i = mblob ? i + 1 : i;
+ longest_i = uint16_t(i + mblob);
longest = savings;
skip_field: