diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-25 12:08:39 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-25 12:08:39 +0200 |
| commit | 5bb54e514f74c72502d4acb4af323277fa3eb3d1 (patch) | |
| tree | bf16821f4c9e415daa1d1cc4b59a6350baab50fe /sql/sql_table.cc | |
| parent | f692f710b759cc697176405aedd39bf094240269 (diff) | |
| parent | 9248b580b96ba9246169b80ea0ea53be5137f6b0 (diff) | |
| download | mariadb-git-5bb54e514f74c72502d4acb4af323277fa3eb3d1.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/bug25262/my50-bug25262
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
sql/sql_table.cc:
Auto merged
mysql-test/r/alter_table.result:
Merge tests
mysql-test/t/alter_table.test:
Merge tests
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 6f953349c03..f7478691293 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -3316,6 +3316,12 @@ view_err: create_info->avg_row_length= table->s->avg_row_length; if (!(used_fields & HA_CREATE_USED_DEFAULT_CHARSET)) create_info->default_table_charset= table->s->table_charset; + if (!(used_fields & HA_CREATE_USED_AUTO) && table->found_next_number_field) + { + /* Table has an autoincrement, copy value to new table */ + table->file->info(HA_STATUS_AUTO); + create_info->auto_increment_value= table->file->auto_increment_value; + } restore_record(table, s->default_values); // Empty record for DEFAULT List_iterator<Alter_drop> drop_it(alter_info->drop_list); |