summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorserg@serg.mylan <>2003-06-29 00:34:47 +0200
committerserg@serg.mylan <>2003-06-29 00:34:47 +0200
commit730f7e3f3798ad8b56cf7232d19c337ae91f4c67 (patch)
tree862959d33e40ba3720eebed0ed3969ba24b52e59 /sql
parent08f8ab59173fd1727a216c6f9eb5a35c02b7f8a2 (diff)
parentd5fbeee71fe8e757754c3b3edc5e1e01d1f67088 (diff)
downloadmariadb-git-730f7e3f3798ad8b56cf7232d19c337ae91f4c67.tar.gz
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
Diffstat (limited to 'sql')
-rw-r--r--sql/field.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/field.cc b/sql/field.cc
index 394078b7aab..4aa58180a69 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -2672,6 +2672,7 @@ Field_timestamp::Field_timestamp(char *ptr_arg, uint32 len_arg,
:Field_str(ptr_arg, 19, (uchar*) 0,0,
unireg_check_arg, field_name_arg, table_arg, cs)
{
+ flags|=ZEROFILL_FLAG; /* 4.0 MYD compatibility */
if (table && !table->timestamp_field)
{
table->timestamp_field= this; // Automatic timestamp