summaryrefslogtreecommitdiff
path: root/sql/unireg.cc
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2019-06-27 01:21:41 +0300
committerMonty <monty@mariadb.org>2019-06-27 01:21:41 +0300
commit1a41fc77ddec7d93b0cf9be4123c86685e726b07 (patch)
treef51e3de69f50e3377af0dce0dc1edfc68f70fbd3 /sql/unireg.cc
parent8e2a24bb3339bb8d2bcef2a473e785a55a06dd59 (diff)
parentbb702c2e4c24632678b548ee1515c6a5b8173808 (diff)
downloadmariadb-git-1a41fc77ddec7d93b0cf9be4123c86685e726b07.tar.gz
Merge remote-tracking branch 'origin/10.4' into 10.5
Diffstat (limited to 'sql/unireg.cc')
-rw-r--r--sql/unireg.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc
index a3dcf69d2f2..7728620fb63 100644
--- a/sql/unireg.cc
+++ b/sql/unireg.cc
@@ -738,7 +738,7 @@ static bool pack_header(THD *thd, uchar *forminfo,
(const char **) thd->alloc(sizeof(char*) *
(field->interval->count+1));
tmpint->type_lengths=
- (uint *) thd->alloc(sizeof(uint) * field->interval->count);
+ (uint *) thd->alloc(sizeof(uint) * field->interval->count+1);
tmpint->type_names[field->interval->count]= 0;
tmpint->type_lengths[field->interval->count]= 0;