bk commit into 5.0 tree (andrey:1.1963) BUG#12490

[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.1963 05/08/10 16:34:37 andrey@lmy004. +1 -0
  fix for bug #12490 (Packets out of order if calling HELP CONTENTS from SP)

  sql/sql_yacc.yy
    1.411 05/08/10 16:34:31 andrey@lmy004. +11 -2
    disable HELP in SP

# 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:	/home/andrey/mysql-5.0-setopt

--- 1.410/sql/sql_yacc.yy	2005-07-19 18:52:55 +02:00
+++ 1.411/sql/sql_yacc.yy	2005-08-10 16:34:31 +02:00
@@ -1015,11 +1015,20 @@
 /* help */
 
 help:
-       HELP_SYM ident_or_text
+       HELP_SYM
+       {
+	  if (Lex->sphead)
+	  {
+            yyerror(ER(ER_SYNTAX_ERROR));
+	    YYABORT;
+	  }
+       }
+       ident_or_text
        {
 	  LEX *lex= Lex;
+
 	  lex->sql_command= SQLCOM_HELP;
-	  lex->help_arg= $2.str;
+	  lex->help_arg= $3.str;
        };
 
 /* change master */