diff options
| author | unknown <monty@mysql.com> | 2004-11-03 20:07:17 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-11-03 20:07:17 +0200 |
| commit | 3693aa4715119b0f8a5e58df241685b8272c1bac (patch) | |
| tree | 364ff201b75e401866182c04d8fbcf11ebccff51 /sql/sql_table.cc | |
| parent | 4fb5d78d5e2806b4cd693b6f061bb4f5f72db261 (diff) | |
| download | mariadb-git-3693aa4715119b0f8a5e58df241685b8272c1bac.tar.gz | |
After merge fixes
libmysqld/lib_sql.cc:
After merge fix
sql/handler.cc:
Cleanup
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index e5d060f99fb..26c483a61a8 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -3085,7 +3085,6 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name, } /* We don't want update TIMESTAMP fields during ALTER TABLE. */ - new_table->timestamp_field_type= TIMESTAMP_NO_AUTO_SET; thd->count_cuted_fields= CHECK_FIELD_WARN; // calc cuted fields thd->cuted_fields=0L; thd->proc_info="copy to tmp table"; @@ -3093,7 +3092,7 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name, copied=deleted=0; if (new_table && !new_table->is_view) { - new_table->timestamp_default_now= 0; + new_table->timestamp_field_type= TIMESTAMP_NO_AUTO_SET; new_table->next_number_field=new_table->found_next_number_field; error=copy_data_between_tables(table,new_table,create_list, handle_duplicates, |