diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-12-06 10:25:44 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-12-06 10:25:44 +0200 |
| commit | b7b25dc666a8d331d16231f9fb658af8c05ac694 (patch) | |
| tree | 0c7798c2d187db0da7837a70f306a789afc16521 /sql/sql_insert.cc | |
| parent | ab5e4eefd5d25c6e0755c2460dbb433a7a9e913b (diff) | |
| parent | b3c72b9a02e570a4a66ca0a64e94fe1116976c85 (diff) | |
| download | mariadb-git-b7b25dc666a8d331d16231f9fb658af8c05ac694.tar.gz | |
Merge with 5.1-release.
- Fixed problem with oqgraph and 'make dist'
Note that after this merge we have a problem show in join_outer where we examine too many rows in one specific case (related to BUG#57024).
This will be fixed when mwl#128 is merged into 5.3.
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 7267d73a29c..adc82d791b6 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1519,9 +1519,7 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info) table->file->adjust_next_insert_id_after_explicit_value( table->next_number_field->val_int()); info->touched++; - if (((table->file->ha_table_flags() & HA_PARTIAL_COLUMN_READ) && - !bitmap_is_subset(table->write_set, table->read_set)) || - compare_record(table)) + if (!records_are_comparable(table) || compare_record(table)) { if ((error=table->file->ha_update_row(table->record[1], table->record[0])) && |