diff options
| author | unknown <rburnett@bk-internal.mysql.com> | 2006-05-18 17:24:29 +0200 |
|---|---|---|
| committer | unknown <rburnett@bk-internal.mysql.com> | 2006-05-18 17:24:29 +0200 |
| commit | 9fb5b6d32bb624676c2e77a406ee2b23ddff26c2 (patch) | |
| tree | 7b7d06310d27238dfd3d4ab6aceb49efe62279fa /sql/share | |
| parent | b47b7355e03a2b82f2d4a95c83d1e8f0a6828925 (diff) | |
| parent | a5d9932b8fc7eb47c4bcd059dd666a2b0f577c7b (diff) | |
| download | mariadb-git-9fb5b6d32bb624676c2e77a406ee2b23ddff26c2.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
include/my_sys.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysys/my_init.c:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
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 887b777a716..afce1128147 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5472,7 +5472,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" |