merge

configure.in:
  Auto merged
sql/ha_innobase.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

1 files changed, 8 insertions, 0 deletions

diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc
index 7d7bae1112b..c192443da0a 100644
--- a/sql/ha_myisam.cc
+++ b/sql/ha_myisam.cc
@@ -231,8 +231,16 @@ int ha_myisam::close(void)
 int ha_myisam::write_row(byte * buf)
 {
   statistic_increment(ha_write_count,&LOCK_status);
+
+  /* If we have a timestamp column, update it to the current time */
+
   if (table->time_stamp)
     update_timestamp(buf+table->time_stamp-1);
+
+  /*
+    If we have an auto_increment column and we are writing a changed row
+    or a new row, then update the auto_increment value in the record.
+  */
   if (table->next_number_field && buf == table->record[0])
     update_auto_increment();
   return mi_write(file,buf);