diff options
| author | unknown <tsmith/tim@siva.hindu.god> | 2006-12-04 11:38:40 -0700 |
|---|---|---|
| committer | unknown <tsmith/tim@siva.hindu.god> | 2006-12-04 11:38:40 -0700 |
| commit | 1f695dbf7d0df8085ef974e0d5a2f71968ce944b (patch) | |
| tree | 8eeb40db5d6f185178be38ea72e3af7ca59910a1 /sql/share | |
| parent | bfee156a8b9ef5679fc7b4751ac6b1cffb8f7e39 (diff) | |
| download | mariadb-git-1f695dbf7d0df8085ef974e0d5a2f71968ce944b.tar.gz | |
Apply malff@weblab.(none) fix for bug 24736 directly to
mysql-5.1-build tree, in order to get it into mysql-5.1
faster. See comments from Marc's original push for
patch details.
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 |