diff options
author | unknown <mkindahl@dl145k.mysql.com> | 2006-07-12 10:07:07 +0200 |
---|---|---|
committer | unknown <mkindahl@dl145k.mysql.com> | 2006-07-12 10:07:07 +0200 |
commit | d9ed3ee58052555e2f1f0836f6b59e9639dd09d8 (patch) | |
tree | 8045f4182223ef36e0b281df5532191053108301 /sql/ha_partition.h | |
parent | e3e3c527812de51e4bf61354a8b7622a752f8914 (diff) | |
parent | c76e87272b030423ca2f67a0ce140192216fc0de (diff) | |
download | mariadb-git-d9ed3ee58052555e2f1f0836f6b59e9639dd09d8.tar.gz |
Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.1
into dl145k.mysql.com:/data0/mkindahl/bk/mysql-5.1-new-rpl
sql/ha_federated.cc:
Auto merged
Diffstat (limited to 'sql/ha_partition.h')
-rw-r--r-- | sql/ha_partition.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_partition.h b/sql/ha_partition.h index 4c627cd50f8..f9fe5f2501f 100644 --- a/sql/ha_partition.h +++ b/sql/ha_partition.h @@ -811,7 +811,7 @@ public: auto_increment_column_changed ------------------------------------------------------------------------- */ - virtual void restore_auto_increment(); + virtual void restore_auto_increment(ulonglong prev_insert_id); virtual void get_auto_increment(ulonglong offset, ulonglong increment, ulonglong nb_desired_values, ulonglong *first_value, |