bk commit into 3.23 tree

[sasha]

Below is the list of changes that have just been commited into a local
3.23. repository of sasha. When sasha does a push, they will be
propogaged to the main repository and within 24 hours after the push into
the public repository. For information on how to access
the public repository see
http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet@stripped, 2001-09-10 17:30:29-06:00, sasha@stripped
  fixed IDENTITY crisis

  mysql-test/r/identity.result
    1.1 01/09/10 17:30:28 sasha@stripped +4 -0

  mysql-test/t/identity.test
    1.1 01/09/10 17:30:28 sasha@stripped +2 -0

  mysql-test/r/identity.result
    1.0 01/09/10 17:30:28 sasha@stripped +0 -0
    BitKeeper file /home/sasha/src/bk/mysql/mysql-test/r/identity.result

  mysql-test/t/identity.test
    1.0 01/09/10 17:30:28 sasha@stripped +0 -0
    BitKeeper file /home/sasha/src/bk/mysql/mysql-test/t/identity.test

  sql/sql_lex.cc
    1.18 01/09/10 17:30:28 sasha@stripped +13 -3
    fixed IDENTITY crisis

# 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:	sasha
# Host:	mysql.sashanet.com
# Root:	/home/sasha/src/bk/mysql

--- 1.17/sql/sql_lex.cc	Thu Aug  9 09:51:16 2001
+++ 1.18/sql/sql_lex.cc	Mon Sep 10 17:30:28 2001
@@ -793,9 +793,19 @@
       }
       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) '@');
--- New file ---
+++ mysql-test/r/identity.result	01/09/10 17:30:28
last_insert_id(345)
345
@@IDENTITY	last_insert_id()
345	345

--- New file ---
+++ mysql-test/t/identity.test	01/09/10 17:30:28
select last_insert_id(345);
select @@IDENTITY,last_insert_id();