fix an overly agressive optimization in Item_func_conv_charset

1 files changed, 8 insertions, 0 deletions

diff --git a/mysql-test/t/mdev316.test b/mysql-test/t/mdev316.test
index 376fd9ffc25..5843b06a60e 100644
--- a/mysql-test/t/mdev316.test
+++ b/mysql-test/t/mdev316.test
@@ -4,3 +4,11 @@
 set names swe7;
 select '' in ('',convert(0,time));
 select case '' when '' then 1 when convert(0,time) then 2 end;
+
+#
+# Excessive optimization of Item_func_conv_charset:
+#
+select convert(0x0030 using ucs2) div 1, concat(convert(0x0030 using ucs2)) div 1;
+select cast(convert(0x0030 using ucs2) as double), cast(concat(convert(0x0030 using ucs2)) as double);
+select cast(convert(0x0030 using ucs2) as decimal(5.2)), cast(concat(convert(0x0030 using ucs2)) as decimal(5.2));
+select cast(convert(_ucs2 0x0030 using latin1) as date), cast(concat(convert(_ucs2 0x0030 using latin1)) as date);