bk commit into 5.0 tree (andrey:1.1915) 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.1915 05/08/29 12:19:08 andrey@lmy004. +3 -0
  fix for bug #12490 (all-in-one patch)
  (Packets out of order if calling HELP CONTENTS from Stored Procedure)

  sql/sql_yacc.yy
    1.418 05/08/29 12:19:02 andrey@lmy004. +10 -2
    disable HELP in SP
    (fixes bug 12490)

  mysql-test/t/sp-error.test
    1.83 05/08/29 12:19:02 andrey@lmy004. +13 -0
    test for bug 12490
    (Packets out of order if calling HELP CONTENTS from Stored Procedure)

  mysql-test/r/sp-error.result
    1.79 05/08/29 12:19:02 andrey@lmy004. +8 -0
    results of test of bug 12490

# 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

--- 1.417/sql/sql_yacc.yy	2005-08-25 00:50:54 +02:00
+++ 1.418/sql/sql_yacc.yy	2005-08-29 12:19:02 +02:00
@@ -1016,11 +1016,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 */

--- 1.78/mysql-test/r/sp-error.result	2005-08-18 17:07:16 +02:00
+++ 1.79/mysql-test/r/sp-error.result	2005-08-29 12:19:02 +02:00
@@ -748,6 +748,14 @@
 call bug11394(2, 1)|
 ERROR HY000: Recursive stored routines are not allowed.
 drop procedure bug11394|
+CREATE PROCEDURE BUG_12490() HELP CONTENTS;
+ERROR 0A000: HELP is not allowed in stored procedures
+CREATE FUNCTION BUG_12490() RETURNS INT HELP CONTENTS;
+ERROR 0A000: HELP is not allowed in stored procedures
+CREATE TABLE t_bug_12490(a int);
+CREATE TRIGGER BUG_12490 BEFORE UPDATE ON t_bug_12490 FOR EACH ROW HELP CONTENTS;
+ERROR 0A000: HELP is not allowed in stored procedures
+DROP TABLE t_bug_12490;
 drop function if exists bug11834_1;
 drop function if exists bug11834_2;
 create function bug11834_1() returns int return 10;

--- 1.82/mysql-test/t/sp-error.test	2005-08-23 07:12:24 +02:00
+++ 1.83/mysql-test/t/sp-error.test	2005-08-29 12:19:02 +02:00
@@ -1079,6 +1079,19 @@
 drop procedure bug11394|
 delimiter ;|
 
+
+#
+# BUG 12490 (Packets out of order if calling HELP CONTENTS from Stored Procedure)
+#
+--error 1314
+CREATE PROCEDURE BUG_12490() HELP CONTENTS;
+--error 1314
+CREATE FUNCTION BUG_12490() RETURNS INT HELP CONTENTS;
+CREATE TABLE t_bug_12490(a int);
+--error 1314
+CREATE TRIGGER BUG_12490 BEFORE UPDATE ON t_bug_12490 FOR EACH ROW HELP CONTENTS;
+DROP TABLE t_bug_12490;
+
 #
 # Bug#11834 "Re-execution of prepared statement with dropped function
 # crashes server". Also tests handling of prepared stmts which use