diff options
| author | msvensson@neptunus.(none) <> | 2006-12-04 19:11:55 +0100 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2006-12-04 19:11:55 +0100 |
| commit | 971c783f7dd3a136693722f20a815b7171bbbcd8 (patch) | |
| tree | ac382a3e694ccbe7ed5a481331e35e4f055fdcae /sql/share | |
| parent | 6072b7a4c4b786604b4584058c6c62a339b6d3ba (diff) | |
| parent | b70d2b9341ae804fbd5147500a4d29bd86e2a5d6 (diff) | |
| download | mariadb-git-971c783f7dd3a136693722f20a815b7171bbbcd8.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
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 cfeca697692..c64f4da045e 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -6010,6 +6010,8 @@ ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT 42000 eng "Incorrect parameter count in the call to native function '%-.64s'" ER_WRONG_PARAMETERS_TO_NATIVE_FCT 42000 eng "Incorrect parameters in the call to native function '%-.64s'" +ER_WRONG_PARAMETERS_TO_STORED_FCT 42000 + eng "Incorrect parameters in the call to stored function '%-.64s'" ER_NATIVE_FCT_NAME_COLLISION eng "This function '%-.64s' has the same name as a native function." ER_BINLOG_PURGE_EMFILE |