diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-01-15 19:07:46 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-15 19:07:46 +0100 |
| commit | aca8e7ed6b176f28e8a34ebddc989574d93f305c (patch) | |
| tree | c0d20e5b3e9518f48d789e2220eea46d9010966d /sql/item.cc | |
| parent | 750b9147fced7202b541be946e044eb739b20a03 (diff) | |
| parent | 4f67a14700c0266c58b05be0dbd8fc10f88464a6 (diff) | |
| download | mariadb-git-aca8e7ed6b176f28e8a34ebddc989574d93f305c.tar.gz | |
5.3 merge
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/sql/item.cc b/sql/item.cc index 8be339541e1..e6462d1c070 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -8851,9 +8851,10 @@ int Item_cache_temporal::save_in_field(Field *field, bool no_conversions) } -void Item_cache_temporal::store_packed(longlong val_arg) +void Item_cache_temporal::store_packed(longlong val_arg, Item *example) { /* An explicit values is given, save it. */ + store(example); value_cached= true; value= val_arg; null_value= false; @@ -9599,11 +9600,18 @@ table_map Item_ref::used_tables() const void Item_ref::update_used_tables() -{ +{ if (!get_depended_from()) - (*ref)->update_used_tables(); + (*ref)->update_used_tables(); + maybe_null= (*ref)->maybe_null; } +void Item_direct_view_ref::update_used_tables() +{ + Item_ref::update_used_tables(); + if (view->table && view->table->maybe_null) + maybe_null= TRUE; +} table_map Item_direct_view_ref::used_tables() const { |