mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-17 20:37:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '10.4' into 10.5

Browse source
This commit is contained in:
Oleksandr Byelkin 2023-01-27 13:54:14 +01:00
commit 7fa02f5c0b
114 changed files with 3236 additions and 650 deletions
Download patch file Download diff file Expand all files Collapse all files

2
storage/mroonga/vendor/groonga/lib/alloc.c vendored
View file

@ -828,7 +828,7 @@ grn_free_default(grn_ctx *ctx, void *ptr,
if (ptr) {
GRN_ADD_ALLOC_COUNT(-1);
} else {
GRN_LOG(ctx, GRN_LOG_ALERT, "free fail (%s:%d) <%d>",
GRN_LOG(ctx, GRN_LOG_ALERT, "free fail (nullptr) (%s:%d) <%d>",
file, line, alloc_count);
}
}