diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-06-09 17:23:39 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-06-09 17:23:39 +0200 |
| commit | aeb256fb27a3b3a87ebd9a1ed4367b012232c6a6 (patch) | |
| tree | 409ebafb1a45415e89137c3066110afaa94420ae /sql/item_sum.cc | |
| parent | 0a0aeb08e5f450111ee4b369b50db668d245ad02 (diff) | |
| download | mariadb-git-aeb256fb27a3b3a87ebd9a1ed4367b012232c6a6.tar.gz | |
bugfixes:
microsecond(TIME)
alter table datetime<->datetime(6)
max(TIME), mix(TIME)
mysql-test/t/func_if.test:
fix the test case of avoid overflow
sql/field.cc:
don't use make_date() and make_time()
sql/field.h:
correct eq_def() for temporal fields
sql/item.cc:
move datetime caching from Item_cache_int
to Item_cache_temporal
sql/item.h:
move datetime caching from Item_cache_int
to Item_cache_temporal
sql/item_func.cc:
use existing helper methods, don't duplicate
sql/item_sum.cc:
argument cache must use argument's cmp_type, not result_type.
sql/item_timefunc.cc:
use existing methods, don't tuplicate.
remove unused function.
fix micorseconds() to support TIME argument
sql/mysql_priv.h:
dead code
sql/time.cc:
dead code
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index a91c034c933..43d004e9b50 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -670,7 +670,7 @@ void Item_sum_hybrid::setup_hybrid(Item *item, Item *value_arg) /* Don't cache value, as it will change */ if (!item->const_item()) value->set_used_tables(RAND_TABLE_BIT); - if (!(arg_cache= Item_cache::get_cache(item))) + if (!(arg_cache= Item_cache::get_cache(item, item->cmp_type()))) return; arg_cache->setup(item); /* Don't cache value, as it will change */ |