changed for AUTO_VALUE_ON_ZERO

mysql-test/r/auto_increment.result:
  added test for AUTO_VALUE_ON_ZERO
mysql-test/t/auto_increment.test:
  added test for AUTO_VALUE_ON_ZERO

1 files changed, 4 insertions, 4 deletions

diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index a7798588d59..dbb29cf53e3 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -2247,8 +2247,8 @@ fill_record(List<Item> &fields,List<Item> &values, bool ignore_errors)
     value=v++;
     Field *rfield= field->field;
     TABLE *table= rfield->table;
-    if (rfield==table->next_number_field)
-      table->auto_increment_field_is_null= false;
+    if (rfield == table->next_number_field)
+      table->auto_increment_field_not_null= true;
     if (value->save_in_field(rfield, 0) > 0 && !ignore_errors)
       DBUG_RETURN(1);
   }
@@ -2268,8 +2268,8 @@ fill_record(Field **ptr,List<Item> &values, bool ignore_errors)
   {
     value=v++;
     TABLE *table= field->table;
-    if (field==table->next_number_field)
-      table->auto_increment_field_is_null= false;
+    if (field == table->next_number_field)
+      table->auto_increment_field_not_null= true;
     if (value->save_in_field(field, 0) == 1 && !ignore_errors)
       DBUG_RETURN(1);
   }