database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2020-03-17 07:58:41 +02:00
parent 023d986732 097e2f9d0a
commit c7ba92372b
17 changed files with 221 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
strings/json_lib.c
View File

@@ -1885,7 +1885,15 @@ static enum json_types smart_read_value(json_engine_t *je,
*value_len= (int) ((char *) je->s.c_str - *value);
}
return (enum json_types)je->value_type;
compile_time_assert((int) JSON_VALUE_OBJECT == (int) JSV_OBJECT);
compile_time_assert((int) JSON_VALUE_ARRAY == (int) JSV_ARRAY);
compile_time_assert((int) JSON_VALUE_STRING == (int) JSV_STRING);
compile_time_assert((int) JSON_VALUE_NUMBER == (int) JSV_NUMBER);
compile_time_assert((int) JSON_VALUE_TRUE == (int) JSV_TRUE);
compile_time_assert((int) JSON_VALUE_FALSE == (int) JSV_FALSE);
compile_time_assert((int) JSON_VALUE_NULL == (int) JSV_NULL);
return (enum json_types) je->value_type;
err_return:
return JSV_BAD_JSON;