diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2017-10-30 14:59:43 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2017-10-30 14:59:43 +0400 |
| commit | b5689c6c872dc73d55c8150bcdc221fd04647a04 (patch) | |
| tree | 12833cc6e4ab52686b8a09298982ca391ceae1f9 /sql/item_jsonfunc.cc | |
| parent | 58e0dcb93dc2b2bf49f76c754bd216dbdf875a0d (diff) | |
| download | mariadb-git-b5689c6c872dc73d55c8150bcdc221fd04647a04.tar.gz | |
Compiler warnings fixed.
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 f7be5b68892..9493d75018d 100644 --- a/sql/item_jsonfunc.cc +++ b/sql/item_jsonfunc.cc @@ -1352,6 +1352,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) @@ -2058,7 +2060,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; if (args[0]->null_value) |