diff options
| author | unknown <rburnett@bk-internal.mysql.com> | 2006-08-15 17:02:08 +0200 |
|---|---|---|
| committer | unknown <rburnett@bk-internal.mysql.com> | 2006-08-15 17:02:08 +0200 |
| commit | 3e9a1eafd220ec21488cd7f092b85fb411cd3418 (patch) | |
| tree | ae449711ddeef5eb430097fb5e116e7ea433f333 /sql/share | |
| parent | cabca09fe585223fc5e7b65cd67d27d79d559b64 (diff) | |
| parent | 0cd51b1afdc8c6192614af62925a2bcd73287a7f (diff) | |
| download | mariadb-git-3e9a1eafd220ec21488cd7f092b85fb411cd3418.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
sql/share/errmsg.txt:
Auto merged
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 8a5cb3439f7..e90f54608e1 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 |