diff options
| author | unknown <dlenev@mysql.com> | 2005-08-10 10:32:43 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-08-10 10:32:43 +0400 |
| commit | 8559ef627d9f461693de97e8b86a1e74923e8a12 (patch) | |
| tree | 6fecb34f6ba6951e91946003276f8ccaaa5d4ddf /sql/share | |
| parent | 031981273397c54de2dfff254158ba3c715b8471 (diff) | |
| parent | f6fff55eb01baf5830db23198cd9d0c2bdeb4bb5 (diff) | |
| download | mariadb-git-8559ef627d9f461693de97e8b86a1e74923e8a12.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg12280
sql/sql_parse.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 2d46a2192b9..7ad8e7c3030 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5137,8 +5137,8 @@ ER_SP_CANT_ALTER eng "Failed to ALTER %s %s" ER_SP_SUBSELECT_NYI 0A000 eng "Subselect value not supported" -ER_SP_NO_USE 42000 - eng "USE is not allowed in a stored procedure" +ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG 0A000 + eng "%s is not allowed in stored function or trigger" ER_SP_VARCOND_AFTER_CURSHNDLR 42000 eng "Variable or condition declaration after cursor or handler declaration" ER_SP_CURSOR_AFTER_HANDLER 42000 |