diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-17 19:39:05 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-17 19:39:05 +0200 |
commit | 94b45787045677c106a25ebb5aaf1273040b2ff6 (patch) | |
tree | 4231461f1f43bc3dd1335c7f7738cd85d2957621 /unittest | |
parent | 66b8edf8a57c106b15ef1de2b25ce3e992540b71 (diff) | |
parent | 16388f393c63b3e2158db1efec8dd9625a0a295e (diff) | |
download | mariadb-git-94b45787045677c106a25ebb5aaf1273040b2ff6.tar.gz |
Merge 10.5 into 10.6
Diffstat (limited to 'unittest')
-rw-r--r-- | unittest/mysys/stacktrace-t.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c index 8fa0db15b36..d8408f80d76 100644 --- a/unittest/mysys/stacktrace-t.c +++ b/unittest/mysys/stacktrace-t.c @@ -29,6 +29,7 @@ void test_my_safe_print_str() memcpy(b_stack, "LEGAL", 6); memcpy(b_bss, "LEGAL", 6); +#ifdef HAVE_STACKTRACE #ifndef __SANITIZE_ADDRESS__ fprintf(stderr, "\n===== stack =====\n"); my_safe_print_str(b_stack, 65535); @@ -48,6 +49,7 @@ void test_my_safe_print_str() fprintf(stderr, "\n===== (const char*) 1 =====\n"); my_safe_print_str((const char*)1, 5); #endif /*__SANITIZE_ADDRESS__*/ +#endif /*HAVE_STACKTRACE*/ free(b_heap); |