Below is the list of changes that have just been committed into a local
5.0 repository of cmiller. When cmiller 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@stripped, 2006-08-15 19:34:53+02:00, cmiller@stripped +1 -0
Merge maint1.mysql.com:/data/localhome/cmiller/bug20908/my50-bug20908
into maint1.mysql.com:/data/localhome/cmiller/mysql-5.0-maint
MERGE: 1.2226.4.1
sql/sql_lex.cc@stripped, 2006-08-15 19:34:50+02:00, cmiller@stripped +0 -0
Auto merged
MERGE: 1.190.1.3
# 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: cmiller
# Host: maint1.mysql.com
# Root: /data/localhome/cmiller/mysql-5.0-maint/RESYNC
--- 1.194/sql/sql_lex.cc 2006-08-15 19:34:58 +02:00
+++ 1.195/sql/sql_lex.cc 2006-08-15 19:34:58 +02:00
@@ -1043,6 +1043,8 @@ int MYSQLlex(void *arg, void *yythd)
if (c == '.')
lex->next_state=MY_LEX_IDENT_SEP;
length= (uint) (lex->ptr - lex->tok_start)-1;
+ if (length == 0)
+ return(ABORT_SYM); // Names must be nonempty.
if ((tokval= find_keyword(lex,length,0)))
{
yyUnget(); // Put back 'c'
| Thread |
|---|
| • bk commit into 5.0 tree (cmiller:1.2246) | Chad MILLER | 15 Aug |