diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-19 17:41:13 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-19 17:41:13 +0200 |
| commit | fc124778ea4e3d0d6bc35d816b367d0ed470bf0c (patch) | |
| tree | b5e694a4c6c7a73494762d7f54c9114e14c9098e /sql/item_func.cc | |
| parent | a4cd91c526933e87d78a4a3fec66a074616f3c32 (diff) | |
| parent | 88b6dc4db5567951f9c0d0baa6e965d44a7130b1 (diff) | |
| download | mariadb-git-fc124778ea4e3d0d6bc35d816b367d0ed470bf0c.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 86f00ecb412..9fcde96c58e 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -4654,7 +4654,7 @@ bool Item_func_set_user_var::register_field_in_bitmap(void *arg) true failure */ -static bool +bool update_hash(user_var_entry *entry, bool set_null, void *ptr, size_t length, Item_result type, CHARSET_INFO *cs, bool unsigned_arg) |