diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc
index 95df0254d4c..f09aa911631 100644
--- a/storage/connect/ha_connect.cc
+++ b/storage/connect/ha_connect.cc
@@ -3141,7 +3141,7 @@ char *ha_connect::encode(PGLOBAL g, char *cnm)
   char  *buf= (char*)PlugSubAlloc(g, NULL, strlen(cnm) * 3);
   uint   dummy_errors;
   uint32 len= copy_and_convert(buf, strlen(cnm) * 3,
-                               &my_charset_utf8_bin,
+                               &my_charset_utf8_general_ci,
                                cnm, strlen(cnm),
                                &my_charset_latin1,
                                &dummy_errors);
diff --git a/storage/connect/libdoc.cpp b/storage/connect/libdoc.cpp
index cef4fa7b01e..00c206dc862 100644
--- a/storage/connect/libdoc.cpp
+++ b/storage/connect/libdoc.cpp
@@ -376,7 +376,7 @@ int LIBXMLDOC::Decode(xmlChar *cnt, char *buf, int n)
   const char *txt = (const char *)cnt;
   uint   dummy_errors;
   uint32 len= copy_and_convert(buf, n, &my_charset_latin1, txt,
-                               strlen(txt), &my_charset_utf8_bin,
+                               strlen(txt), &my_charset_utf8_general_ci,
                                &dummy_errors);
   buf[len]= '\0';
   return 0;
@@ -388,7 +388,7 @@ int LIBXMLDOC::Decode(xmlChar *cnt, char *buf, int n)
 xmlChar *LIBXMLDOC::Encode(PGLOBAL g, char *txt)
   {
   const CHARSET_INFO *ics= &my_charset_latin1; // TODO: Field->charset()
-  const CHARSET_INFO *ocs= &my_charset_utf8_bin;
+  const CHARSET_INFO *ocs= &my_charset_utf8_general_ci;
   size_t      i = strlen(txt);
   size_t      o = i * ocs->mbmaxlen / ics->mbmaxlen + 1;
   char        *buf;