diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-06 13:00:09 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-06 13:00:09 +0300 |
| commit | 2d8e38bc9477aa00b371ed14d95390bede70c5cb (patch) | |
| tree | 7d4e4e22138572b769263994697d69bd141c5bf3 /sql/share | |
| parent | b249abde57f1788a8085f45cc6252ee70ece3354 (diff) | |
| parent | 4e1ca388381eea27a9275571744ad17ce317b273 (diff) | |
| download | mariadb-git-2d8e38bc9477aa00b371ed14d95390bede70c5cb.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 453ce5be4e0..4f1e19037b0 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -5499,9 +5499,10 @@ ER_TRG_DOES_NOT_EXIST hindi "TRIGGER मौजूद नहीं है" spa "El disparador no existe" ER_TRG_ON_VIEW_OR_TEMP_TABLE - eng "Trigger's '%-.192s' is view or temporary table" - ger "'%-.192s' des Triggers ist View oder temporäre Tabelle" - spa "El disparador '%-.192s' es una vista o tabla temporal" + eng "Trigger's '%-.192s' is a view, temporary table or sequence" + ger "'%-.192s' des Triggers ist ein View, temporäre Tabelle oder Sequence" + spa "El disparador '%-.192s' es una vista, tabla temporal o secuencia" + hindi "Trigger का '%-.192s' एक व्यू, टेम्पररी टेबल या सीक्वेंस है" ER_TRG_CANT_CHANGE_ROW eng "Updating of %s row is not allowed in %strigger" ger "Aktualisieren einer %s-Zeile ist in einem %s-Trigger nicht erlaubt" @@ -8574,8 +8575,8 @@ ER_SEQUENCE_RUN_OUT eng "Sequence '%-.64s.%-.64s' has run out" spa "La secuencia '%-.64s.%-.64s' se ha agotado" ER_SEQUENCE_INVALID_DATA - eng "Sequence '%-.64s.%-.64s' values are conflicting" - spa "Los valores de secuencia '%-.64s.%-.64s' son conflictivos" + eng "Sequence '%-.64s.%-.64s' has out of range value for options" + spa "La secuencia '%-.64s.%-.64s' tiene un valor fuera de rango para las opciones" ER_SEQUENCE_INVALID_TABLE_STRUCTURE eng "Sequence '%-.64s.%-.64s' table structure is invalid (%s)" spa "La estuctura de tabla de secuencia '%-.64s.%-.64s' es inválida (%s)" |