diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-12-06 16:43:52 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-12-06 16:43:52 +0400 |
| commit | 4cb784139164980d312c1d7e59dca6abc79ff2cb (patch) | |
| tree | d4344520c75d0480771d307564f3fca65d498ec4 /sql/ha_partition.cc | |
| parent | 55dea2fc982cf7fb8f14404f51b1b6cb2d2a66ca (diff) | |
| parent | b6c0c1754c5d378de3d37ca02b21df7dfaa3b229 (diff) | |
| download | mariadb-git-4cb784139164980d312c1d7e59dca6abc79ff2cb.tar.gz | |
Merge mysql.com:/home/hf/work/32247/my51-32247
into mysql.com:/home/hf/work/mrg/my51-mrg
mysql-test/r/partition.result:
merging
mysql-test/t/partition.test:
merging
sql/ha_partition.cc:
SCCS merged
Diffstat (limited to 'sql/ha_partition.cc')
| -rw-r--r-- | sql/ha_partition.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 7234222b79f..76668a5b810 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -1598,7 +1598,11 @@ error: void ha_partition::update_create_info(HA_CREATE_INFO *create_info) { - m_file[0]->update_create_info(create_info); + info(HA_STATUS_AUTO); + + if (!(create_info->used_fields & HA_CREATE_USED_AUTO)) + create_info->auto_increment_value= stats.auto_increment_value; + create_info->data_file_name= create_info->index_file_name = NULL; return; } |