Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/dlenev/src/mysql-4.1-ryan

1 files changed, 1 insertions, 1 deletions

diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 7464523aad4..65ac38cdd6e 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -945,7 +945,7 @@ TABLE *open_table(THD *thd,const char *db,const char *table_name,
   table->keys_in_use_for_query= table->keys_in_use;
   table->used_keys= table->keys_for_keyread;
   if (table->timestamp_field)
-    table->timestamp_field->set_timestamp_offsets();
+    table->timestamp_field_type= table->timestamp_field->get_auto_set_type();
   DBUG_ASSERT(table->key_read == 0);
   DBUG_RETURN(table);
 }