diff options
| author | unknown <igor@olga.mysql.com> | 2007-05-08 17:50:19 -0700 |
|---|---|---|
| committer | unknown <igor@olga.mysql.com> | 2007-05-08 17:50:19 -0700 |
| commit | 0ba14149aade1857b97ac61e34823aa589a152b2 (patch) | |
| tree | a538488e0ace77bbd2a40d64e1135135cbb37fec /sql/sql_load.cc | |
| parent | a15fe8d972c7feb1c8eb940f8cd43c75f1256896 (diff) | |
| parent | c863f1eeb6288527ffdb298e14e25506310f0adf (diff) | |
| download | mariadb-git-0ba14149aade1857b97ac61e34823aa589a152b2.tar.gz | |
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into olga.mysql.com:/home/igor/mysql-5.1-opt
mysql-test/t/loaddata.test:
Auto merged
sql/sql_load.cc:
Auto merged
mysql-test/r/loaddata.result:
SCCS merged
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 |