database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.11' into 11.4

Browse Source
This commit is contained in:
Oleksandr Byelkin
2025-06-17 09:50:22 +02:00
parent 9bf0492b7d 11d1ac7285
commit 89c7e2b9c7
196 changed files with 4543 additions and 1172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
strings/json_lib.c
View File

@@ -1698,7 +1698,7 @@ static enum json_esc_char_classes json_escape_chr_map[0x60] = {
};
static const char hexconv[16] = "0123456789ABCDEF";
static const char hexconv[17] = "0123456789ABCDEF";
int json_escape(CHARSET_INFO *str_cs,
@@ -1874,13 +1874,13 @@ static enum json_types smart_read_value(json_engine_t *je,
*value_len= (int) ((char *) je->s.c_str - *value);
}
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);
compile_time_assert((enum json_types)JSON_VALUE_OBJECT == JSV_OBJECT);
compile_time_assert((enum json_types)JSON_VALUE_ARRAY == JSV_ARRAY);
compile_time_assert((enum json_types)JSON_VALUE_STRING == JSV_STRING);
compile_time_assert((enum json_types)JSON_VALUE_NUMBER == JSV_NUMBER);
compile_time_assert((enum json_types)JSON_VALUE_TRUE == JSV_TRUE);
compile_time_assert((enum json_types)JSON_VALUE_FALSE == JSV_FALSE);
compile_time_assert((enum json_types)JSON_VALUE_NULL == JSV_NULL);
return (enum json_types) je->value_type;