bk commit into 5.0 tree (andrey:1.1908)

[ahristov]

Below is the list of changes that have just been committed into a local
5.0 repository of andrey. When andrey 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.1908 05/08/29 12:20:36 andrey@lmy004. +1 -0
  Merge ahristov@stripped:/home/bk/mysql-5.0
  into lmy004.:/work/mysql-5.0-ready4

  sql/sql_yacc.yy
    1.414 05/08/29 12:20:33 andrey@lmy004. +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:	andrey
# Host:	lmy004.
# Root:	/work/mysql-5.0-ready4/RESYNC

--- 1.413/sql/sql_yacc.yy	2005-08-27 15:53:47 +02:00
+++ 1.414/sql/sql_yacc.yy	2005-08-29 12:20:33 +02:00
@@ -1020,11 +1020,19 @@
 /* help */
 
 help:
-       HELP_SYM ident_or_text
+       HELP_SYM
+       {
+         if (Lex->sphead)
+         {
+           my_error(ER_SP_BADSTATEMENT, MYF(0), "HELP");
+           YYABORT;
+         }
+       }
+       ident_or_text
        {
 	  LEX *lex= Lex;
 	  lex->sql_command= SQLCOM_HELP;
-	  lex->help_arg= $2.str;
+	  lex->help_arg= $3.str;
        };
 
 /* change master */