summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
diff options
context:
space:
mode:
authormsvensson@neptunus.(none) <>2005-09-28 11:34:53 +0200
committermsvensson@neptunus.(none) <>2005-09-28 11:34:53 +0200
commitfbf4a5e07962792a918207541a2666a7968df4ca (patch)
tree5b0761b29daf8c864538d0fb55e20e9b54758e47 /sql/sql_load.cc
parent70b9b5eef34a608f415db270e1914e6163d90ced (diff)
parent1105d4293dfa37e1658956b07e48908495fa65f7 (diff)
downloadmariadb-git-fbf4a5e07962792a918207541a2666a7968df4ca.tar.gz
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
Diffstat (limited to 'sql/sql_load.cc')
-rw-r--r--sql/sql_load.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index 30398375360..ff2be0ae6fb 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -564,6 +564,8 @@ 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;