diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-02 11:40:02 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-02 11:40:02 +0200 |
| commit | 081fd8bfa280635a7e699a17b035032460cb5160 (patch) | |
| tree | d5ea2c0f31aafe566d749f6dd60f5bc631f60862 /sql/item_func.cc | |
| parent | 09cea8703f3ec4e4f9e23855a339c9e3d5e84d3b (diff) | |
| parent | a193c5720ea461ce82390af3fe9c292581242223 (diff) | |
| download | mariadb-git-081fd8bfa280635a7e699a17b035032460cb5160.tar.gz | |
Merge 10.1 into 10.2
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 89ca25bbfd4..f755deea23b 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -4818,7 +4818,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, uint length, Item_result type, CHARSET_INFO *cs, bool unsigned_arg) |