Merge 10.4 into 10.5

This commit is contained in:
Marko Mäkelä 2021-04-21 09:01:01 +03:00
commit 80ed136e6d
163 changed files with 8186 additions and 3347 deletions

View file

@ -2989,7 +2989,8 @@ grn_select(grn_ctx *ctx, grn_select_data *data)
char *cp = cache_key;
#define PUT_CACHE_KEY(string) \
grn_memcpy(cp, (string).value, (string).length); \
if ((string).value) \
grn_memcpy(cp, (string).value, (string).length); \
cp += (string).length; \
*cp++ = '\0'