--- mysql-gui-common/library/base-library/source/myx_library.c	2007-03-12 13:32:12.000000000 +0200
+++ mysql-gui-common/library/base-library/source/myx_library.patched.c	2007-10-04 17:01:51.000000000 +0300
@@ -694,7 +694,7 @@
     mysql_options(mysql, MYSQL_OPT_USE_REMOTE_CONNECTION, (char *)1);
 #endif
 
-  mysql_options(mysql, MYSQL_SET_CHARSET_NAME, "utf8");
+  //mysql_options(mysql, MYSQL_SET_CHARSET_NAME, "utf8");
 
   if(connect_options.use_ssl != 0)
   {
@@ -728,8 +728,11 @@
         !     mysql_version_is_later_or_equal_than(mysql, 5, 0)) ||
        mysql_full_version_is_later_or_equal_than(mysql, 5, 0, 2))
   {
-    if (mysql_query(mysql, "SET NAMES utf8"))
-      return -1;
+    char* db_charset = myx_get_server_variable(mysql, "character_set_database");
+
+    if (strcmp(db_charset, "utf8") != 0)
+      if (mysql_query(mysql, "SET NAMES utf8"))
+        return -1;
   }
   // using SET CHARACTER SET utf8;
   else if (mysql_version_is_later_or_equal_than(mysql,4,1))