database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.2 into bb-10.2-ext

Browse Source
This commit is contained in:
Marko Mäkelä
2017-11-01 14:37:31 +02:00
parent 003cb2f424 6b7918d524
commit 2ec7b87053
29 changed files with 174 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/item_jsonfunc.cc
View File

@ -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);