diff options
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 28bb4d4dec5..b49b7248021 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5194,7 +5194,7 @@ ER_VIEW_SELECT_VARIABLE rus "View SELECT содержит переменную или параметр" ukr "View SELECT ма╓ зминну або параметер" ER_VIEW_SELECT_TMPTABLE - eng "View's SELECT contains a temporary table '%-.64s'" + eng "View's SELECT refers to a temporary table '%-.64s'" rus "View SELECT содержит ссылку на временную таблицу '%-.64s'" ukr "View SELECT використову╓ тимчасову таблицю '%-.64s'" ER_VIEW_WRONG_LIST @@ -5342,8 +5342,8 @@ ER_SP_DUP_HANDLER 42000 eng "Duplicate handler declared in the same block" ER_SP_NOT_VAR_ARG 42000 eng "OUT or INOUT argument %d for routine %s is not a variable" -ER_SP_NO_RETSET_IN_FUNC 0A000 - eng "Not allowed to return a result set from a function" +ER_SP_NO_RETSET 0A000 + eng "Not allowed to return a result set from a %s" ER_CANT_CREATE_GEOMETRY_OBJECT 22003 eng "Cannot get geometry object from data you send to the GEOMETRY field" ER_FAILED_ROUTINE_BREAK_BINLOG @@ -5395,5 +5395,7 @@ ER_TOO_BIG_DISPLAYWIDTH 42000 S1009 eng "Display width out of range for column '%-.64s' (max = %d)" ER_XAER_DUPID XAE08 eng "XAER_DUPID: The XID already exists" +ER_DATETIME_FUNCTION_OVERFLOW 22008 + eng "Datetime function: %-.32s field overflow" ER_CANT_UPDATE_USED_TABLE_IN_SF_OR_TRG eng "Can't update table '%-.64s' in stored function/trigger because it is already used by statement which invoked this stored function/trigger." |