diff --git a/mysql-test/r/ctype_recoding.result b/mysql-test/r/ctype_recoding.result
index ed59de87395..d40360b9337 100644
--- a/mysql-test/r/ctype_recoding.result
+++ b/mysql-test/r/ctype_recoding.result
@@ -111,3 +111,28 @@ SET character_set_connection=cp1251;
 SELECT hex('耘釉');
 hex('耘釉')
 F2E5F1F2
+USE test;
+SET NAMES binary;
+CREATE TABLE `褌械褋褌` (`褌械褋褌` int);
+SHOW CREATE TABLE `褌械褋褌`;
+Table	Create Table
+褌械褋褌	CREATE TABLE `褌械褋褌` (
+  `褌械褋褌` int(11) default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+SET NAMES utf8;
+SHOW CREATE TABLE `褌械褋褌`;
+Table	Create Table
+褌械褋褌	CREATE TABLE `褌械褋褌` (
+  `褌械褋褌` int(11) default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP TABLE `褌械褋褌`;
+SET NAMES binary;
+SET character_set_connection=utf8;
+SELECT '褌械褋褌' as s;
+s
+褌械褋褌
+SET NAMES utf8;
+SET character_set_connection=binary;
+SELECT '褌械褋褌' as s;
+s
+褌械褋褌
diff --git a/mysql-test/t/ctype_recoding.test b/mysql-test/t/ctype_recoding.test
index 8ac22e89c2d..45cc0cebfb3 100644
--- a/mysql-test/t/ctype_recoding.test
+++ b/mysql-test/t/ctype_recoding.test
@@ -78,3 +78,22 @@ SET NAMES koi8r;
 SELECT hex('耘釉');
 SET character_set_connection=cp1251;
 SELECT hex('耘釉');
+
+USE test;
+
+# Bug#4417
+# Check that identifiers and strings are not converted 
+# when the client character set is binary.
+
+SET NAMES binary;
+CREATE TABLE `褌械褋褌` (`褌械褋褌` int);
+SHOW CREATE TABLE `褌械褋褌`;
+SET NAMES utf8;
+SHOW CREATE TABLE `褌械褋褌`;
+DROP TABLE `褌械褋褌`;
+SET NAMES binary;
+SET character_set_connection=utf8;
+SELECT '褌械褋褌' as s;
+SET NAMES utf8;
+SET character_set_connection=binary;
+SELECT '褌械褋褌' as s;
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 7aa3bbbdd7b..ad4eb9f6801 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -533,21 +533,23 @@ bool THD::convert_string(String *s, CHARSET_INFO *from_cs, CHARSET_INFO *to_cs)
   return FALSE;
 }
 
+
 /*
   Update some cache variables when character set changes
 */
 
 void THD::update_charset()
 {
-  charset_is_system_charset= my_charset_same(charset(),system_charset_info);
-  charset_is_collation_connection= my_charset_same(charset(),
-						   variables.
-						   collation_connection);
+  uint32 not_used;
+  charset_is_system_charset= !String::needs_conversion(0,charset(),
+                                                       system_charset_info,
+                                                       &not_used);
+  charset_is_collation_connection= 
+    !String::needs_conversion(0,charset(),variables.collation_connection,
+                              &not_used);
 }
 
 
-
-
 /* routings to adding tables to list of changed in transaction tables */
 
 inline static void list_include(CHANGED_TABLE_LIST** prev,