bk commit into 5.0 tree (andrey:1.1964) 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.1964 05/08/10 18:04:17 andrey@lmy004. +3 -0
  fixes for fix for bug #12490

  sql/sql_yacc.yy
    1.412 05/08/10 18:04:11 andrey@lmy004. +1 -1
    throw accurate error

  mysql-test/t/sp-error.test
    1.80 05/08/10 18:04:11 andrey@lmy004. +12 -0
    test for bug 12490

  mysql-test/r/sp-error.result
    1.77 05/08/10 18:04:10 andrey@lmy004. +8 -0
    add test for 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:	/home/andrey/mysql-5.0-setopt

--- 1.411/sql/sql_yacc.yy	2005-08-10 16:34:31 +02:00
+++ 1.412/sql/sql_yacc.yy	2005-08-10 18:04:11 +02:00
@@ -1019,7 +1019,7 @@
        {
 	  if (Lex->sphead)
 	  {
-            yyerror(ER(ER_SYNTAX_ERROR));
+            my_error(ER_SP_BADSTATEMENT, MYF(0), "HELP");
 	    YYABORT;
 	  }
        }

--- 1.76/mysql-test/r/sp-error.result	2005-07-13 11:57:01 +02:00
+++ 1.77/mysql-test/r/sp-error.result	2005-08-10 18:04:10 +02:00
@@ -734,3 +734,11 @@
 ERROR 42000: FUNCTION test.bug11834_1 does not exist
 deallocate prepare stmt;
 drop function bug11834_2;
+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;

--- 1.79/mysql-test/t/sp-error.test	2005-07-13 11:57:01 +02:00
+++ 1.80/mysql-test/t/sp-error.test	2005-08-10 18:04:11 +02:00
@@ -1072,3 +1072,15 @@
 execute stmt;
 deallocate prepare stmt;
 drop function bug11834_2;
+
+#
+# BUG 12490
+#
+--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;