diff options
| author | acurtis/antony@xiphis.org/ltantony.xiphis.org <> | 2006-08-14 21:27:36 -0700 |
|---|---|---|
| committer | acurtis/antony@xiphis.org/ltantony.xiphis.org <> | 2006-08-14 21:27:36 -0700 |
| commit | e2d4aa2ca4a7cdb451020b47a50eb340b18dbc32 (patch) | |
| tree | 51e2422c10878ea5a789059de1577c5827adafdb /sql/share | |
| parent | c43a332859b6d216d5fe4eef3ef639b1f117f6bd (diff) | |
| parent | 6b9629422323fdfa1709776d63b0eae1bd72cd1f (diff) | |
| download | mariadb-git-e2d4aa2ca4a7cdb451020b47a50eb340b18dbc32.tar.gz | |
Merge xiphis.org:/home/antony/work2/mysql-5.0-engines
into xiphis.org:/home/antony/work2/mysql-5.0-merge
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 5c967ba19bd..4f37b1ab4d2 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -4893,8 +4893,8 @@ ER_WARN_TOO_MANY_RECORDS 01000 por "Conta de registro é maior que a conta de coluna na linha %ld" spa "Línea %ld fué truncada; La misma contine mas datos que las que existen en las columnas de entrada" ER_WARN_NULL_TO_NOTNULL 22004 - eng "Column set to default value; NULL supplied to NOT NULL column '%s' at row %ld" - ger "Feld auf Vorgabewert gesetzt, da NULL für NOT-NULL-Feld '%s' in Zeile %ld angegeben" + eng "Column was set to data type implicit default; NULL supplied for NOT NULL column '%s' at row %ld" + ger "Feld auf Datentyp-spezifischen Vorgabewert gesetzt; da NULL für NOT-NULL-Feld '%s' in Zeile %ld angegeben" por "Dado truncado, NULL fornecido para NOT NULL coluna '%s' na linha %ld" spa "Datos truncado, NULL suministrado para NOT NULL columna '%s' en la línea %ld" ER_WARN_DATA_OUT_OF_RANGE 22003 |