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 10.6 into 10.11

Browse Source
This commit is contained in:
Marko Mäkelä
2024-11-29 13:43:17 +02:00
parent 27c7e73f9a 7d4077cc11
commit 3d23adb766
397 changed files with 6215 additions and 4216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
strings/json_normalize.c
View File

@@ -308,10 +308,9 @@ json_norm_value_string_init(struct json_norm_value *val,
}
static int
json_norm_kv_comp(const struct json_norm_kv *a,
const struct json_norm_kv *b)
static int json_norm_kv_comp(const void *a_, const void *b_)
{
const struct json_norm_kv *a= a_, *b= b_;
return my_strnncoll(&my_charset_utf8mb4_bin,
(const uchar *)a->key.str, a->key.length,
(const uchar *)b->key.str, b->key.length);
@@ -333,8 +332,7 @@ json_normalize_sort(struct json_norm_value *val)
}
my_qsort(dynamic_element(pairs, 0, struct json_norm_kv*),
pairs->elements, sizeof(struct json_norm_kv),
(qsort_cmp) json_norm_kv_comp);
pairs->elements, sizeof(struct json_norm_kv), json_norm_kv_comp);
break;
}
case JSON_VALUE_ARRAY: