summaryrefslogtreecommitdiff
path: root/sql/sql_insert.cc
diff options
context:
space:
mode:
authorunknown <gkodinov/kgeorge@magare.gmz>2007-06-12 18:41:56 +0300
committerunknown <gkodinov/kgeorge@magare.gmz>2007-06-12 18:41:56 +0300
commit95ef943b9e08e30619425440a57c549aa61cb351 (patch)
treecd6dcc472edd09fe28af2e6d1e1ef39c3ee3a949 /sql/sql_insert.cc
parente53dfc6df42d83c45ec5121c98dcbcff7960beab (diff)
downloadmariadb-git-95ef943b9e08e30619425440a57c549aa61cb351.tar.gz
5.0-opt -> 5.1-opt merge
Diffstat (limited to 'sql/sql_insert.cc')
-rw-r--r--sql/sql_insert.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 66c48772c4e..0ce52779ce1 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -1419,8 +1419,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->table_flags() & HA_PARTIAL_COLUMN_READ) ||
- compare_record(table, thd->query_id))
+ if ((table->file->ha_table_flags() & HA_PARTIAL_COLUMN_READ) ||
+ compare_record(table))
{
if ((error=table->file->ha_update_row(table->record[1],
table->record[0])))