Skip to content

M
MariaDB
Commit b17bcca6 authored by tomas@poseidon.ndb.mysql.com's avatar tomas@poseidon.ndb.mysql.com
Browse files
Options

merge error

parent f6ad0583
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
sql/ha_ndbcluster.cc
View file @ b17bcca6
...@@ -1547,8 +1547,8 @@ int ha_ndbcluster::write_row(byte *record) ...@@ -1547,8 +1547,8 @@ int ha_ndbcluster::write_row(byte *record)
} }
statistic_increment(ha_write_count,&LOCK_status); statistic_increment(ha_write_count,&LOCK_status);
if (table->timestamp_default_now) if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_INSERT)
update_timestamp(record+table->timestamp_default_now-1); table->timestamp_field->set_time();
has_auto_increment= (table->next_number_field && record == table->record[0]); has_auto_increment= (table->next_number_field && record == table->record[0]);
if (!(op= trans->getNdbOperation((const NDBTAB *) m_table))) if (!(op= trans->getNdbOperation((const NDBTAB *) m_table)))
...@@ -1698,8 +1698,8 @@ int ha_ndbcluster::update_row(const byte *old_data, byte *new_data) ...@@ -1698,8 +1698,8 @@ int ha_ndbcluster::update_row(const byte *old_data, byte *new_data)
DBUG_ENTER("update_row"); DBUG_ENTER("update_row");
statistic_increment(ha_update_count,&LOCK_status); statistic_increment(ha_update_count,&LOCK_status);
if (table->timestamp_on_update_now) if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_UPDATE)
update_timestamp(new_data+table->timestamp_on_update_now-1); table->timestamp_field->set_time();
/* Check for update of primary key for special handling */ /* Check for update of primary key for special handling */
if ((table->primary_key != MAX_KEY) && if ((table->primary_key != MAX_KEY) &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7