From 4d882329a998b7955cf164b5ff687e623d25bbb5 Mon Sep 17 00:00:00 2001
From: unknown <sanja@askmonty.org>
Date: Mon, 17 Nov 2014 17:13:30 +0100
Subject: MDEV-7116: Dynamic column hangs/segfaults

Going to 'create_new_string:' caused double freeing alloc_plan (there and at 'end:').
---
 mysql-test/r/dyncol.result | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'mysql-test/r/dyncol.result')

diff --git a/mysql-test/r/dyncol.result b/mysql-test/r/dyncol.result
index 4753728793a..cc4e8074395 100644
--- a/mysql-test/r/dyncol.result
+++ b/mysql-test/r/dyncol.result
@@ -1777,5 +1777,27 @@ group_concat(cast(column_json(dyn) as char))
 {"name1":"value1","name2":"value2"}
 drop table t1;
 #
+# MDEV-7116: Dynamic column hangs/segfaults
+#
+create table t1 (
+impressions mediumblob
+);
+insert into t1 values ("");
+update  t1
+set     impressions = column_add(impressions,
+'total', 12,
+'2014-10-28 16:00:00', 3,
+'2014-10-30 15:00:00', 3,
+'2014-11-04 09:00:00', 6
+);
+update  t1
+set     impressions = column_add(impressions,
+'total', "a12",
+'2014-10-28 16:00:00', "a3",
+'2014-10-30 15:00:00', "a3",
+'2014-11-04 09:00:00', "a6"
+        );
+drop table t1;
+#
 # end of 10.0 tests
 #
-- 
cgit v1.2.1