1 files changed, 26 insertions, 0 deletions
diff --git a/mysql-test/t/dyncol.test b/mysql-test/t/dyncol.test
index c5d442ebe49..65a94dcb49e 100644
--- a/mysql-test/t/dyncol.test
+++ b/mysql-test/t/dyncol.test
@@ -839,5 +839,31 @@ select group_concat(cast(column_json(dyn) as char)) from t1;
 drop table t1;
 
 --echo #
+--echo # MDEV-7116: Dynamic column hangs/segfaults
+--echo #
+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;
+
+--echo #
 --echo # end of 10.0 tests
 --echo #