diff options
| author | unknown <dlenev@mysql.com> | 2004-10-01 18:55:17 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2004-10-01 18:55:17 +0400 |
| commit | 2971cd81208f32e43079aa7a0ad560333e74bbde (patch) | |
| tree | 12cd5073864c613ab90e10cbb1d221b60226d09e /sql/sql_table.cc | |
| parent | 8b671a920598e9dbe2b071b1453b70243de02f60 (diff) | |
| parent | c2a255218d60d2de645ff6ae0d8c52b4891d46f7 (diff) | |
| download | mariadb-git-2971cd81208f32e43079aa7a0ad560333e74bbde.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-ryan
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 6d7a4ff269d..113f71236bf 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -3053,12 +3053,8 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name, } - /* - We don't want update TIMESTAMP fields during ALTER TABLE - and copy_data_between_tables uses only write_row() for new_table so - don't need to set up timestamp_on_update_now member. - */ - new_table->timestamp_default_now= 0; + /* We don't want update TIMESTAMP fields during ALTER TABLE. */ + new_table->timestamp_field_type= TIMESTAMP_NO_AUTO_SET; new_table->next_number_field=new_table->found_next_number_field; thd->count_cuted_fields= CHECK_FIELD_WARN; // calc cuted fields thd->cuted_fields=0L; |