diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-11-01 14:37:31 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-11-01 14:37:31 +0200 |
| commit | 2ec7b870531d70f3c7686af2d6bc2c33e7c23bc7 (patch) | |
| tree | e34961a67eca9e9de984784f6d60961568cbbb7e /sql/item_jsonfunc.cc | |
| parent | 003cb2f42477772ae43228c0bc0f8492246b9340 (diff) | |
| parent | 6b7918d524d5fc1f63f520cf88784fef13a43c25 (diff) | |
| download | mariadb-git-2ec7b870531d70f3c7686af2d6bc2c33e7c23bc7.tar.gz | |
Merge 10.2 into bb-10.2-ext
Diffstat (limited to 'sql/item_jsonfunc.cc')
| -rw-r--r-- | sql/item_jsonfunc.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/item_jsonfunc.cc b/sql/item_jsonfunc.cc index b30d32c36ac..ddc1da5b6d2 100644 --- a/sql/item_jsonfunc.cc +++ b/sql/item_jsonfunc.cc @@ -1353,6 +1353,8 @@ longlong Item_func_json_contains_path::val_int() bzero(p_found, (arg_count-2) * sizeof(bool)); n_found= arg_count - 2; } + else + n_found= 0; /* Jost to prevent 'uninitialized value' warnings */ result= 0; while (json_get_path_next(&je, &p) == 0) @@ -2059,7 +2061,7 @@ String *Item_func_json_merge::val_str(String *str) { DBUG_ASSERT(fixed == 1); json_engine_t je1, je2; - String *js1= args[0]->val_json(&tmp_js1), *js2; + String *js1= args[0]->val_json(&tmp_js1), *js2=NULL; uint n_arg; LINT_INIT(js2); |