From 8cfd4949c2725431d78605d30c1138c4d42ab4d2 Mon Sep 17 00:00:00 2001
From: unknown <sasha@mysql.sashanet.com>
Date: Mon, 10 Sep 2001 17:30:29 -0600
Subject: fixed IDENTITY crisis

---
 sql/sql_lex.cc | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'sql')

diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 20bda932f2f..e0044a0710f 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -793,9 +793,19 @@ int yylex(void *arg)
       }
       break;
     case STATE_USER_END:		// end '@' of user@hostname
-      if (state_map[yyPeek()] != STATE_STRING &&
-	  state_map[yyPeek()] != STATE_USER_VARIABLE_DELIMITER)
-	lex->next_state=STATE_HOSTNAME;	// Mark for next loop     
+      switch (state_map[yyPeek()])
+      {
+      case STATE_STRING:
+      case STATE_USER_VARIABLE_DELIMITER:
+	break;
+      case STATE_USER_END:
+	lex->next_state=STATE_USER_END;
+	yySkip();
+	break;
+      default:
+	lex->next_state=STATE_HOSTNAME;
+	break;
+      }
       yylval->lex_str.str=(char*) lex->ptr;
       yylval->lex_str.length=1;
       return((int) '@');
-- 
cgit v1.2.1