diff options
| author | unknown <sanja@montyprogram.com> | 2013-01-21 14:34:39 +0200 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2013-01-21 14:34:39 +0200 |
| commit | 193c6f548b3702b4259560c40ca24c1243053388 (patch) | |
| tree | 57cc1570fc8c9364cb7b3d57e6d67d2cb9af8993 /sql | |
| parent | a0710621bf463db66d81f42134dd66f8b03c276a (diff) | |
| download | mariadb-git-193c6f548b3702b4259560c40ca24c1243053388.tar.gz | |
MDEV-3873: fixed functions absend in 5.3.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_func.h | 5 | ||||
| -rw-r--r-- | sql/item_strfunc.cc | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 88491be44a2..516cdd548d0 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -2053,6 +2053,11 @@ public: enum_field_types field_type() const { return last_value->field_type(); } bool const_item() const { return 0; } void evaluate_sideeffects(); + void update_uesd_tables() + { + Item_func_last_value::update_used_tables(); + maybe_null= last_value->maybe_null; + } }; diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 0c1f556b398..3fc5e504b85 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -341,7 +341,7 @@ String *Item_func_sha2::val_str_ascii(String *str) void Item_func_sha2::fix_length_and_dec() { - maybe_null = 1; + set_persist_maybe_null(1); max_length = 0; #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY) |