Merge mysql.com:/usr/local/bk/mysql-5.0

into mysql.com:/home/pem/work/mysql-5.0

include/mysqld_error.h

@@ -312,7 +312,7 @@
 #define ER_SP_UNINIT_VAR 1292
 #define ER_SP_BADSELECT 1293
 #define ER_SP_BADRETURN 1294
-#define ER_SP_BADQUERY 1295
+#define ER_SP_BADSTATEMENT 1295
 #define ER_UPDATE_LOG_DEPRECATED_IGNORED 1296
 #define ER_UPDATE_LOG_DEPRECATED_TRANSLATED 1297
 #define ER_QUERY_INTERRUPTED 1298

include/sql_state.h

@@ -171,9 +171,9 @@ ER_SP_LILABEL_MISMATCH,		"42000", "",
 ER_SP_LABEL_REDEFINE,		"42000", "",
 ER_SP_LABEL_MISMATCH,		"42000", "",
 ER_SP_UNINIT_VAR,		"01000", "",
-ER_SP_BADSELECT,		"04000", "",
+ER_SP_BADSELECT,		"0A000", "",
 ER_SP_BADRETURN,		"42000", "",
-ER_SP_BADQUERY,			"04000", "",
+ER_SP_BADSTATEMENT,		"0A000", "",
 ER_UPDATE_LOG_DEPRECATED_IGNORED, "42000", "",
 ER_UPDATE_LOG_DEPRECATED_TRANSLATED, "42000", "",
 ER_QUERY_INTERRUPTED,		"70100", "",

mysql-test/r/sp-error.result

@@ -79,7 +79,7 @@ select name from mysql.proc;
 select type from mysql.proc;
 end;
 call foo();
-ERROR 04000: SELECT in a stored procedure must have INTO
+ERROR 0A000: SELECT in a stored procedure must have INTO
 drop procedure foo;
 create procedure foo()
 return 42;
@@ -90,7 +90,7 @@ declare x int;
 select max(c) into x from test.t;
 return x;
 end;
-ERROR 04000: Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION
+ERROR 0A000: Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION
 create procedure p(x int)
 insert into test.t1 values (x);
 create function f(x int) returns int

sql/share/czech/errmsg.txt

@@ -307,7 +307,7 @@ character-set=latin2
 "Referring to uninitialized variable %s"
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
-"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
+"Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
 "Query execution was interrupted"

sql/share/danish/errmsg.txt

@@ -301,7 +301,7 @@ character-set=latin1
 "Referring to uninitialized variable %s"
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
-"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
+"Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
 "Query execution was interrupted"

sql/share/dutch/errmsg.txt

@@ -309,7 +309,7 @@ character-set=latin1
 "Referring to uninitialized variable %s"
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
-"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
+"Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
 "Query execution was interrupted"

sql/share/english/errmsg.txt

@@ -298,7 +298,7 @@ character-set=latin1
 "Referring to uninitialized variable %s"
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
-"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
+"Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
 "Query execution was interrupted"

sql/share/estonian/errmsg.txt

@@ -303,7 +303,7 @@ character-set=latin7
 "Referring to uninitialized variable %s"
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
-"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
+"Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
 "Query execution was interrupted"

sql/share/french/errmsg.txt

@@ -298,7 +298,7 @@ character-set=latin1
 "Referring to uninitialized variable %s"
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
-"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
+"Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
 "Query execution was interrupted"

sql/share/german/errmsg.txt

@@ -310,7 +310,7 @@ character-set=latin1
 "Referring to uninitialized variable %s"
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
-"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
+"Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
 "Query execution was interrupted"

sql/share/greek/errmsg.txt

@@ -298,7 +298,7 @@ character-set=greek
 "Referring to uninitialized variable %s"
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
-"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
+"Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
 "Query execution was interrupted"

sql/share/hungarian/errmsg.txt

@@ -300,7 +300,7 @@ character-set=latin2
 "Referring to uninitialized variable %s"
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
-"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
+"Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
 "Query execution was interrupted"

sql/share/italian/errmsg.txt

@@ -298,7 +298,7 @@ character-set=latin1
 "Referring to uninitialized variable %s"
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
-"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
+"Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
 "Query execution was interrupted"

sql/share/japanese/errmsg.txt

@@ -300,7 +300,7 @@ character-set=ujis
 "Referring to uninitialized variable %s"
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
-"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
+"Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
 "Query execution was interrupted"

sql/share/korean/errmsg.txt

@@ -298,7 +298,7 @@ character-set=euckr
 "Referring to uninitialized variable %s"
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
-"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
+"Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
 "Query execution was interrupted"

sql/share/norwegian-ny/errmsg.txt

@@ -300,7 +300,7 @@ character-set=latin1
 "Referring to uninitialized variable %s"
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
-"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
+"Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
 "Query execution was interrupted"

sql/share/norwegian/errmsg.txt

@@ -300,7 +300,7 @@ character-set=latin1
 "Referring to uninitialized variable %s"
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
-"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
+"Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
 "Query execution was interrupted"

sql/share/polish/errmsg.txt

@@ -302,7 +302,7 @@ character-set=latin2
 "Referring to uninitialized variable %s"
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
-"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
+"Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
 "Query execution was interrupted"

sql/share/portuguese/errmsg.txt

@@ -299,7 +299,7 @@ character-set=latin1
 "Referring to uninitialized variable %s"
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
-"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
+"Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
 "Query execution was interrupted"

sql/share/romanian/errmsg.txt

@@ -302,7 +302,7 @@ character-set=latin2
 "Referring to uninitialized variable %s"
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
-"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
+"Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
 "Query execution was interrupted"

sql/share/russian/errmsg.txt

@@ -300,7 +300,7 @@ character-set=koi8r
 "Referring to uninitialized variable %s"
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
-"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
+"Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
 "Query execution was interrupted"

sql/share/serbian/errmsg.txt

@@ -293,7 +293,7 @@ character-set=cp1250
 "Referring to uninitialized variable %s"
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
-"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
+"Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
 "Query execution was interrupted"

sql/share/slovak/errmsg.txt

@@ -306,7 +306,7 @@ character-set=latin2
 "Referring to uninitialized variable %s"
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
-"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
+"Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
 "Query execution was interrupted"

sql/share/spanish/errmsg.txt

@@ -300,7 +300,7 @@ character-set=latin1
 "Referring to uninitialized variable %s"
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
-"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
+"Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
 "Query execution was interrupted"

sql/share/swedish/errmsg.txt

@@ -298,7 +298,7 @@ character-set=latin1
 "Referring to uninitialized variable %s"
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
-"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
+"Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
 "Query execution was interrupted"

sql/share/ukrainian/errmsg.txt

@@ -303,7 +303,7 @@ character-set=koi8u
 "Referring to uninitialized variable %s"
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
-"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
+"Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
 "The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
 "Query execution was interrupted"

sql/sql_yacc.yy

@@ -1523,7 +1523,7 @@ sp_proc_stmt:
 	      if (lex->sphead->m_type == TYPE_ENUM_FUNCTION &&
 		  lex->sql_command != SQLCOM_SET_OPTION)
 	      {
-		send_error(YYTHD, ER_SP_BADQUERY);
+		send_error(YYTHD, ER_SP_BADSTATEMENT);
 		YYABORT;
 	      }
 	      else