diff --git a/mysql-test/r/ctype_latin1.result b/mysql-test/r/ctype_latin1.result
index f8e07e1eb6f..32871563b64 100644
--- a/mysql-test/r/ctype_latin1.result
+++ b/mysql-test/r/ctype_latin1.result
@@ -391,3 +391,17 @@ ABC 
 SELECT convert(@str collate latin1_swedish_ci using utf8);
 convert(@str collate latin1_swedish_ci using utf8)
 ABC €°§ß²³µ~ äöüÄÖÜ áéíóú ÀÈÌÒÙ @ abc
+SET NAMES latin1;
+DROP TABLE IF EXISTS `abcÿdef`;
+CREATE TABLE `abcÿdef` (i int);
+INSERT INTO `abcÿdef` VALUES (1);
+INSERT INTO abcÿdef VALUES (2);
+SELECT * FROM `abcÿdef`;
+i
+1
+2
+SELECT * FROM abcÿdef;
+i
+1
+2
+DROP TABLE `abcÿdef`;
diff --git a/mysql-test/t/ctype_latin1.test b/mysql-test/t/ctype_latin1.test
index dead9a7a0bc..0a112233ffb 100644
--- a/mysql-test/t/ctype_latin1.test
+++ b/mysql-test/t/ctype_latin1.test
@@ -110,3 +110,14 @@ SELECT convert(@str collate latin1_german2_ci using utf8);
 SELECT convert(@str collate latin1_swedish_ci using utf8);
 
 # End of 4.1 tests
+
+SET NAMES latin1;
+--disable_warnings
+DROP TABLE IF EXISTS `abcÿdef`;
+--enable_warnings
+CREATE TABLE `abcÿdef` (i int);
+INSERT INTO `abcÿdef` VALUES (1);
+INSERT INTO abcÿdef VALUES (2);
+SELECT * FROM `abcÿdef`;
+SELECT * FROM abcÿdef;
+DROP TABLE `abcÿdef`;
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index d45f4369095..6811f120c3f 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -777,8 +777,6 @@ int MYSQLlex(void *arg, void *yythd)
 	int length;
 	if ((length= my_mbcharlen(cs, c)) == 1)
 	{
-	  if (c == (uchar) NAMES_SEP_CHAR)
-	    break; /* Old .frm format can't handle this char */
 	  if (c == quote_char)
 	  {
 	    if (yyPeek() != quote_char)