diff options
| author | unknown <pem@mysql.com> | 2006-02-09 13:00:32 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2006-02-09 13:00:32 +0100 |
| commit | 0fd784928c340968967a104dd0191837549ee8a3 (patch) | |
| tree | f93894a80801e8bd4b71a67e4687a69be4eb237c /sql/share | |
| parent | 5ffc2dc202e49607b91851f3e44f60f49f175294 (diff) | |
| download | mariadb-git-0fd784928c340968967a104dd0191837549ee8a3.tar.gz | |
Fixed BUG#16896: Stored function: unused AGGREGATE-clause in CREATE FUNCTION
Check if AGGREGATE was given with a stored (non-UDF) function, and return
error in that case.
Also made udf_example/udf_test work again, by adding a missing *_init()
function. (_init() functions required unless --allow_suspicious_udfs is
given to the server, since March 2005 - it seems udf_example wasn't updated
at the time.)
mysql-test/r/sp-error.result:
Updated results for BUG#16896.
mysql-test/t/sp-error.test:
Added test case for BUG#16896.
sql/share/errmsg.txt:
New error message: ER_SP_NO_AGGREGATE
sql/sql_yacc.yy:
Check if AGGREGATE was used when creating a stored function (i.e. not an UDF).
sql/udf_example.cc:
Added myfunc_int_init() function to make it work when the server is running without
--allow_suspicious_udfs.
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 8017ba3ef9f..1315de6528a 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5607,3 +5607,5 @@ ER_SP_PROC_TABLE_CORRUPT eng "Failed to load routine %s. The table mysql.proc is missing, corrupt, or contains bad data (internal code %d)" ER_SP_WRONG_NAME 42000 eng "Incorrect routine name '%-.64s'" +ER_SP_NO_AGGREGATE 42000 + eng "AGGREGATE is not supported for stored functions" |