summaryrefslogtreecommitdiff
path: root/sql/ha_partition.cc
diff options
context:
space:
mode:
authorMikael Ronstrom <mikael@mysql.com>2009-09-07 12:22:57 +0200
committerMikael Ronstrom <mikael@mysql.com>2009-09-07 12:22:57 +0200
commit6a368130ae51ae8ce7f4ec61ee5d3b11d55e19ff (patch)
tree180fa07edbe0ec9ead2e5df9769f788f0b5c62a6 /sql/ha_partition.cc
parentea5d204370662a751b70d1a940be82601ac1a3b6 (diff)
parenta7ba25f72b67b6e4b45cd44c17d67f9114fd9c5a (diff)
downloadmariadb-git-6a368130ae51ae8ce7f4ec61ee5d3b11d55e19ff.tar.gz
Automerge
Diffstat (limited to 'sql/ha_partition.cc')
-rw-r--r--sql/ha_partition.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index 2e303744c1a..2d232736cf2 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -3025,7 +3025,7 @@ int ha_partition::write_row(uchar * buf)
tmp_disable_binlog(thd); /* Do not replicate the low-level changes. */
error= m_file[part_id]->ha_write_row(buf);
if (have_auto_increment && !table->s->next_number_keypart)
- set_auto_increment_if_higher(table->next_number_field->val_int());
+ set_auto_increment_if_higher(table->next_number_field);
reenable_binlog(thd);
exit:
table->timestamp_field_type= orig_timestamp_type;
@@ -3129,7 +3129,7 @@ exit:
HA_DATA_PARTITION *ha_data= (HA_DATA_PARTITION*) table_share->ha_data;
if (!ha_data->auto_inc_initialized)
info(HA_STATUS_AUTO);
- set_auto_increment_if_higher(table->found_next_number_field->val_int());
+ set_auto_increment_if_higher(table->found_next_number_field);
}
table->timestamp_field_type= orig_timestamp_type;
DBUG_RETURN(error);