Reuse more code: two equal pieces for ENUM and SET where moved

into a function.

2 files changed, 25 insertions, 0 deletions

diff --git a/mysql-test/r/ctype_utf8.result b/mysql-test/r/ctype_utf8.result
index e65eb96cb68..858ba84bbe0 100644
--- a/mysql-test/r/ctype_utf8.result
+++ b/mysql-test/r/ctype_utf8.result
@@ -799,3 +799,16 @@ select * from t1 where b like 'foob%';
 a	b
 2	foobar
 drop table t1;
+create table t1 (
+a enum('петя','вася','анюта') character set utf8 not null default 'анюта',
+b set('петя','вася','анюта') character set utf8 not null default 'анюта'
+);
+create table t2 select concat(a,_utf8'') as a, concat(b,_utf8'')as b from t1;
+show create table t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `a` char(5) character set utf8 NOT NULL default '',
+  `b` char(15) character set utf8 NOT NULL default ''
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+drop table t2;
+drop table t1;
diff --git a/mysql-test/t/ctype_utf8.test b/mysql-test/t/ctype_utf8.test
index 238cd6daef3..1b85379353a 100644
--- a/mysql-test/t/ctype_utf8.test
+++ b/mysql-test/t/ctype_utf8.test
@@ -644,3 +644,15 @@ create table t1 (
 insert into t1 values(1,'foo'),(2,'foobar');
 select * from t1 where b like 'foob%';
 drop table t1;
+
+#
+# Test for calculate_interval_lengths() function
+#
+create table t1 (
+  a enum('петя','вася','анюта') character set utf8 not null default 'анюта',
+  b set('петя','вася','анюта') character set utf8 not null default 'анюта'
+);
+create table t2 select concat(a,_utf8'') as a, concat(b,_utf8'')as b from t1;
+show create table t2;
+drop table t2;
+drop table t1;