Commit f908efb0 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql

parents 9ddc25b4 b3d9ec21

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script. 
AC_INIT(sql/mysqld.cc)

AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

AM_INIT_AUTOMAKE(mysql, 3.23.41)

AM_INIT_AUTOMAKE(mysql, 3.23.42)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10

sql/ha_myisam.cc

+8 −0
Original line number Diff line number Diff line
@@ -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);