mirror of
https://github.com/MariaDB/server.git
synced 2026-05-17 20:37:12 +02:00
Merge branch '10.5' into 10.6
This commit is contained in:
commit
c3a5cf2b5b
133 changed files with 4073 additions and 707 deletions
2
storage/mroonga/vendor/groonga/lib/alloc.c
vendored
2
storage/mroonga/vendor/groonga/lib/alloc.c
vendored
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue