List:Commits« Previous MessageNext Message »
From:bar Date:June 19 2006 2:15pm
Subject:bk commit into 5.1 tree (bar:1.2195)
View as plain text  
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.2195 06/06/19 19:15:03 bar@stripped +1 -0
  Merge mysql.com:/usr/home/bar/mysql-5.1-new.b18396
  into  mysql.com:/usr/home/bar/mysql-5.1-kt

  sql/sql_lex.cc
    1.184 06/06/19 19:14:53 bar@stripped +0 -0
    Auto merged

# 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-kt/RESYNC

--- 1.183/sql/sql_lex.cc	2006-06-15 07:53:51 +05:00
+++ 1.184/sql/sql_lex.cc	2006-06-19 19:14:53 +05:00
@@ -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)
Thread
bk commit into 5.1 tree (bar:1.2195)bar19 Jun