database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-31 15:50:51 +03:00
Code Activity

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

Browse Source
This commit is contained in:
monty@hundin.mysql.fi
2001-08-30 20:39:18 +03:00
parent 9ddc25b471 b3d9ec2124
commit f908efb0a8
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_INIT(sql/mysqld.cc) AC_INIT(sql/mysqld.cc)
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
# The Docs Makefile.am parses this line! # 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) AM_CONFIG_HEADER(config.h)
PROTOCOL_VERSION=10 PROTOCOL_VERSION=10

8
sql/ha_myisam.cc
View File

@@ -231,8 +231,16 @@ int ha_myisam::close(void)
int ha_myisam::write_row(byte * buf) int ha_myisam::write_row(byte * buf)
{ {
statistic_increment(ha_write_count,&LOCK_status); statistic_increment(ha_write_count,&LOCK_status);
/* If we have a timestamp column, update it to the current time */
if (table->time_stamp) if (table->time_stamp)
update_timestamp(buf+table->time_stamp-1); 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]) if (table->next_number_field && buf == table->record[0])
update_auto_increment(); update_auto_increment();
return mi_write(file,buf); return mi_write(file,buf);