diff options
author | konstantin@mysql.com <> | 2006-05-15 00:51:12 +0400 |
---|---|---|
committer | konstantin@mysql.com <> | 2006-05-15 00:51:12 +0400 |
commit | 85c688314619fce4fd555f44d4c7d026cfd8b4cb (patch) | |
tree | 067c19b6f369fee2f9a3eab889db28224f02c1ac /sql/share | |
parent | a0df09eee2522af50e991796bf16c7e6cdf01024 (diff) | |
parent | 0963c705cd6aa875cd86c91afa749b4619d59e6c (diff) | |
download | mariadb-git-85c688314619fce4fd555f44d4c7d026cfd8b4cb.tar.gz |
Merge mysql.com:/opt/local/work/mysql-5.0-root
into mysql.com:/opt/local/work/mysql-5.0-runtime-merge
Diffstat (limited to 'sql/share')
-rw-r--r-- | sql/share/errmsg.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 2892c5c8b01..4e7b9200d88 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5475,7 +5475,7 @@ ER_SP_DUP_HANDLER 42000 eng "Duplicate handler declared in the same block" ger "Doppelter Handler im selben Block deklariert" ER_SP_NOT_VAR_ARG 42000 - eng "OUT or INOUT argument %d for routine %s is not a variable" + eng "OUT or INOUT argument %d for routine %s is not a variable or NEW pseudo-variable in BEFORE trigger" ger "OUT- oder INOUT-Argument %d für Routine %s ist keine Variable" ER_SP_NO_RETSET 0A000 eng "Not allowed to return a result set from a %s" |