summaryrefslogtreecommitdiff
path: root/sql/field.h
diff options
context:
space:
mode:
Diffstat (limited to 'sql/field.h')
-rw-r--r--sql/field.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/field.h b/sql/field.h
index 413a08f08d4..6f049e3809e 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -564,7 +564,10 @@ public:
void set_time();
virtual void set_default()
{
- set_time();
+ if (table->timestamp_field == this)
+ set_time();
+ else
+ Field::set_default();
}
inline long get_timestamp()
{