bk commit into 5.1 tree (bar:1.2161) BUG#18396

[bar]

Below is the list of changes that have just been committed into a local
5.1 repository of bar. When bar does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2161 06/06/06 22:13:30 bar@stripped +3 -0
  Bug#18396 Identifiers: Byte with value 255 not allowed
  Old FRM files didn't allow byte 255 as a column name part.
  Since now we store column names in UTF8, this restriction
  is not required anymore: 255 is not a valid byte in UTF8.
  Fix: removing checking against 255.

  sql/sql_lex.cc
    1.181 06/06/06 22:13:21 bar@stripped +0 -2
    Removing old code, unnecessary anymore.

  mysql-test/t/ctype_latin1.test
    1.10 06/06/06 22:13:21 bar@stripped +11 -0
    Adding test case

  mysql-test/r/ctype_latin1.result
    1.9 06/06/06 22:13:21 bar@stripped +14 -0
    Adding test case

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-5.1-new.b18396

--- 1.180/sql/sql_lex.cc	2006-05-12 13:26:30 +05:00
+++ 1.181/sql/sql_lex.cc	2006-06-06 22:13:21 +05:00
@@ -804,8 +804,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)

--- 1.8/mysql-test/r/ctype_latin1.result	2006-04-06 10:51:17 +05:00
+++ 1.9/mysql-test/r/ctype_latin1.result	2006-06-06 22:13:21 +05:00
 SELECT convert(@str collate latin1_swedish_ci using utf8);
 convert(@str collate latin1_swedish_ci using utf8)
+SET NAMES latin1;
+i
+1
+2
+i
+1
+2

--- 1.9/mysql-test/t/ctype_latin1.test	2006-05-12 21:26:45 +05:00
+++ 1.10/mysql-test/t/ctype_latin1.test	2006-06-06 22:13:21 +05:00
@@ -110,3 +110,14 @@ SELECT convert(@str collate latin1_germa
 SELECT convert(@str collate latin1_swedish_ci using utf8);
 
 # End of 4.1 tests
+
+SET NAMES latin1;
+--disable_warnings
+--enable_warnings