database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge bb-10.2-ext into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2017-10-04 08:24:06 +03:00
parent 2cf3e2ea2f 61b2618d3a
commit 2c1067166d
334 changed files with 5235 additions and 3076 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
strings/json_lib.c
View File

@@ -399,7 +399,7 @@ static int read_strn(json_engine_t *j)
return 1;
j->state= j->stack[j->stack_p];
j->value_len= (j->s.c_str - j->value) - 1;
j->value_len= (int)(j->s.c_str - j->value) - 1;
return 0;
}
@@ -537,7 +537,7 @@ static int read_num(json_engine_t *j)
if (skip_num_constant(j) == 0)
{
j->value_type= JSON_VALUE_NUMBER;
j->value_len= j->s.c_str - j->value_begin;
j->value_len= (int)(j->s.c_str - j->value_begin);
return 0;
}
return 1;
@@ -1494,7 +1494,7 @@ int json_append_ascii(CHARSET_INFO *json_cs,
return c_len;
}
return json - json_start;
return (int)(json - json_start);
}
@@ -1530,7 +1530,7 @@ int json_unescape(CHARSET_INFO *json_cs,
return -1;
}
return s.error==JE_EOS ? res - res_b : -1;
return s.error==JE_EOS ? (int)(res - res_b) : -1;
}
@@ -1645,7 +1645,7 @@ int json_escape(CHARSET_INFO *str_cs,
}
}
return json - json_start;
return (int)(json - json_start);
}