Bug #4555 ALTER TABLE crashes mysqld with enum column collated utf8_unicode_ci

1 files changed, 5 insertions, 2 deletions

diff --git a/sql/field.cc b/sql/field.cc
index 26c84575b4d..c96a5a6d809 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -5625,8 +5625,11 @@ bool Field_enum::eq_def(Field *field)
   if (typelib->count < from_lib->count)
     return 0;
   for (uint i=0 ; i < from_lib->count ; i++)
-    if (my_strcasecmp(field_charset,
-                      typelib->type_names[i],from_lib->type_names[i]))
+    if (my_strnncoll(field_charset,
+                     (const uchar*)typelib->type_names[i],
+                     strlen(typelib->type_names[i]),
+                     (const uchar*)from_lib->type_names[i],
+                     strlen(from_lib->type_names[i])))
       return 0;
   return 1;
 }