BUG#14770 - LOAD DATA INFILE doesn't respect default values for

            columns
Fixed confusing warning.

Quoting INSERT section of the manual:
----
Inserting NULL into a column that has been declared NOT NULL. For
multiple-row INSERT statements or INSERT INTO ... SELECT statements, the
column is set to the implicit default value for the column data type. This
is 0 for numeric types, the empty string ('') for string types, and the
"zero" value for date and time types. INSERT INTO ... SELECT statements are
handled the same way as multiple-row inserts because the server does not
examine the result set from the SELECT to see whether it returns a single
row. (For a single-row INSERT, no warning occurs when NULL is inserted into
a NOT NULL column. Instead, the statement fails with an error.)
----
This is also true for LOAD DATA INFILE. For INSERT user can specify
DEFAULT keyword as a value to set column default. There is no similiar
feature available for LOAD DATA INFILE.

1 files changed, 2 insertions, 2 deletions

diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index 9b20c37ece2..4b2408be6d0 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