diff options
| author | unknown <bell@sanja.is.com.ua> | 2002-12-15 11:14:53 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2002-12-15 11:14:53 +0200 |
| commit | 1062220566db3fc475dc83c27c0e476156232400 (patch) | |
| tree | 1cd675e1a98f5a3bf624aa99ee733c3efb130f5d /sql/item_timefunc.cc | |
| parent | 71a6aa3b0c6b15d57e8552e59c094caf4ce6f41a (diff) | |
| download | mariadb-git-1062220566db3fc475dc83c27c0e476156232400.tar.gz | |
fixed subselect null test
fixed method definition (overloading instead of redefinition)
fixed time expression type definition
mysql-test/r/subselect.result:
test of subselect null test
mysql-test/t/subselect.test:
test of subselect null test
sql/item.h:
fixed method definition (overloading instead of redefinition)
sql/item_subselect.h:
fixed subselect null test
sql/item_timefunc.cc:
fixed time expression type definition
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 7b58fbe8404..061cf208052 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -1025,7 +1025,7 @@ void Item_date_add_interval::fix_length_and_dec() cached_field_type= MYSQL_TYPE_DATETIME; else if (arg0_field_type == MYSQL_TYPE_DATE) { - if (int_type <= INTERVAL_MONTH || int_type == INTERVAL_YEAR_MONTH) + if (int_type <= INTERVAL_DAY || int_type == INTERVAL_YEAR_MONTH) cached_field_type= arg0_field_type; else cached_field_type= MYSQL_TYPE_DATETIME; |