diff options
| author | igor@olga.mysql.com <> | 2007-05-08 17:50:19 -0700 |
|---|---|---|
| committer | igor@olga.mysql.com <> | 2007-05-08 17:50:19 -0700 |
| commit | e4af9fc7905e9eb734ec68e136788af0761b4db4 (patch) | |
| tree | a538488e0ace77bbd2a40d64e1135135cbb37fec /sql/sql_load.cc | |
| parent | fea4af6d498ed5c138772b861fd1171da02eb075 (diff) | |
| parent | b45ef06e76e41a1c23b67a435808132bc9a8006d (diff) | |
| download | mariadb-git-e4af9fc7905e9eb734ec68e136788af0761b4db4.tar.gz | |
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into olga.mysql.com:/home/igor/mysql-5.1-opt
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 71cc4c0507c..a98797d7596 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -605,6 +605,8 @@ read_fixed_length(THD *thd, COPY_INFO &info, TABLE_LIST *table_list, push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_TOO_FEW_RECORDS, ER(ER_WARN_TOO_FEW_RECORDS), thd->row_count); + if (!field->maybe_null() && field->type() == FIELD_TYPE_TIMESTAMP) + ((Field_timestamp*) field)->set_time(); } else { @@ -782,6 +784,8 @@ read_sep_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list, thd->row_count); DBUG_RETURN(1); } + if (!field->maybe_null() && field->type() == FIELD_TYPE_TIMESTAMP) + ((Field_timestamp*) field)->set_time(); /* QQ: We probably should not throw warning for each field. But how about intention to always have the same number |