1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt

into  moonbone.local:/mnt/gentoo64/work/29310-bug-5.1-opt-mysql
This commit is contained in:
evgen@moonbone.local
2007-07-09 00:04:03 +04:00
4 changed files with 65 additions and 1 deletions

View File

@@ -1421,7 +1421,8 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info)
goto before_trg_err;
table->file->restore_auto_increment(prev_insert_id);
if ((table->file->ha_table_flags() & HA_PARTIAL_COLUMN_READ) ||
if ((table->file->ha_table_flags() & HA_PARTIAL_COLUMN_READ &&
!bitmap_is_subset(table->write_set, table->read_set)) ||
compare_record(table))
{
if ((error=table->file->ha_update_row(table->record[1],