summaryrefslogtreecommitdiff
path: root/mysys/ma_dyncol.c
diff options
context:
space:
mode:
authorunknown <sanja@askmonty.org>2014-11-17 17:13:30 +0100
committerunknown <sanja@askmonty.org>2014-11-17 17:13:30 +0100
commit4d882329a998b7955cf164b5ff687e623d25bbb5 (patch)
treedc18758f285309ba290738108bef94b2e18d7214 /mysys/ma_dyncol.c
parente9fc98b5838c06356209196384e37a11e8e3c058 (diff)
downloadmariadb-git-4d882329a998b7955cf164b5ff687e623d25bbb5.tar.gz
MDEV-7116: Dynamic column hangs/segfaults
Going to 'create_new_string:' caused double freeing alloc_plan (there and at 'end:').
Diffstat (limited to 'mysys/ma_dyncol.c')
-rw-r--r--mysys/ma_dyncol.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/mysys/ma_dyncol.c b/mysys/ma_dyncol.c
index c0508b97922..a7a048acac1 100644
--- a/mysys/ma_dyncol.c
+++ b/mysys/ma_dyncol.c
@@ -3591,7 +3591,6 @@ end:
create_new_string:
/* There is no columns from before, so let's just add the new ones */
rc= ER_DYNCOL_OK;
- my_free(alloc_plan);
if (not_null != 0)
rc= dynamic_column_create_many_internal_fmt(str, add_column_count,
(uint*)column_keys, values,