bk commit into 5.1 tree (malff:1.2377) BUG#25302

[marc.alff]

Below is the list of changes that have just been committed into a local
5.1 repository of marcsql. When marcsql 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, 2007-01-02 22:16:24-07:00, malff@weblab.(none) +2 -0
  Bug#25302 (893 reduce/reduce conflicts in parser grammar)
  
  This fix corrects build issues introduced by WL#3031:
  
  - In the SQL grammar, 'USER' is a SQL 2003 reserved keyword,
  and therefore should not be part of the keyword production.
  
  - In sql/sql_parse.cc, the code for CREATE SERVER and ALTER SERVER
  was not using proper format strings in the DBUG_PRINT statements.

  sql/sql_parse.cc@stripped, 2007-01-02 22:16:21-07:00, malff@weblab.(none) +2 -2
    Fixed compiler warnings

  sql/sql_yacc.yy@stripped, 2007-01-02 22:16:21-07:00, malff@weblab.(none) +0 -1
    Fixed reduce/reduce conflicts

# 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:	malff
# Host:	weblab.(none)
# Root:	/home/marcsql/TREE/mysql-5.1-25302

--- 1.616/sql/sql_parse.cc	2007-01-02 22:16:31 -07:00
+++ 1.617/sql/sql_parse.cc	2007-01-02 22:16:31 -07:00
@@ -5195,7 +5195,7 @@ create_sp_error:
     DBUG_PRINT("info", ("case SQLCOM_CREATE_SERVER"));
     if ((error= create_server(thd, &lex->server_options)))
     {
-      DBUG_PRINT("info", ("problem creating server",
+      DBUG_PRINT("info", ("problem creating server <%s>",
                           lex->server_options.server_name));
       my_error(error, MYF(0), lex->server_options.server_name);
       break;
@@ -5210,7 +5210,7 @@ create_sp_error:
     DBUG_PRINT("info", ("case SQLCOM_ALTER_SERVER"));
     if ((error= alter_server(thd, &lex->server_options)))
     {
-      DBUG_PRINT("info", ("problem altering server",
+      DBUG_PRINT("info", ("problem altering server <%s>",
                           lex->server_options.server_name));
       my_error(error, MYF(0), lex->server_options.server_name);
       break;

--- 1.528/sql/sql_yacc.yy	2007-01-02 22:16:31 -07:00
+++ 1.529/sql/sql_yacc.yy	2007-01-02 22:16:31 -07:00
@@ -9589,7 +9589,6 @@ keyword:
 	| TRUNCATE_SYM		{}
 	| UNICODE_SYM		{}
         | UNINSTALL_SYM         {}
-        | USER                  {}
 	| WRAPPER_SYM		{}
         | XA_SYM                {}
         | UPGRADE_SYM           {}