summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
diff options
context:
space:
mode:
authorholyfoot/hf@mysql.com/deer.(none) <>2006-12-07 09:11:56 +0400
committerholyfoot/hf@mysql.com/deer.(none) <>2006-12-07 09:11:56 +0400
commit9203d43427b0abc105dd78eadfd6aa57ea5cf8b5 (patch)
tree04b6463e3f9a0e6021b4db1fce2eb3c1b9f9e8ec /sql/sql_load.cc
parent9e52ef1f9d5252ae85c88e67206ed5d795eea3f4 (diff)
downloadmariadb-git-9203d43427b0abc105dd78eadfd6aa57ea5cf8b5.tar.gz
merging
Diffstat (limited to 'sql/sql_load.cc')
-rw-r--r--sql/sql_load.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index 093e88bf82f..018db006276 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -753,7 +753,7 @@ read_sep_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
Field *field= ((Item_field *)item)->field;
if (field->reset())
{
- my_error(ER_WARN_NULL_TO_NOTNULL, MYF(0),sql_field->field->field_name,
+ my_error(ER_WARN_NULL_TO_NOTNULL, MYF(0),field->field_name,
thd->row_count);
DBUG_RETURN(1);
}