summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/sql_load.cc')
-rw-r--r--sql/sql_load.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index cf356a4b336..7d2c2281bba 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -512,6 +512,7 @@ err:
mysql_unlock_tables(thd, thd->lock);
thd->lock=0;
}
+ table->auto_increment_field_not_null= FALSE;
thd->abort_on_warning= 0;
DBUG_RETURN(error);
}
@@ -609,8 +610,6 @@ read_fixed_length(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
{
uint length;
byte save_chr;
- if (field == table->next_number_field)
- table->auto_increment_field_not_null= TRUE;
if ((length=(uint) (read_info.row_end-pos)) >
field->field_length)
length=field->field_length;