diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-07-13 12:09:59 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-07-13 12:09:59 +0200 |
| commit | 326a8dcd875b76faf85626942eb0e6ee76db304e (patch) | |
| tree | c0d5a91cd2315dd2ce8d06a16c62778c78ca6f0f /include | |
| parent | 64583629aded09f74d6d14178475fe6b2c849c00 (diff) | |
| parent | c6fdb92ca829fed893d9e7324e80b1450de16087 (diff) | |
| download | mariadb-git-326a8dcd875b76faf85626942eb0e6ee76db304e.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_stacktrace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_stacktrace.h b/include/my_stacktrace.h index fb2525e3a12..fad6e532de9 100644 --- a/include/my_stacktrace.h +++ b/include/my_stacktrace.h @@ -45,7 +45,7 @@ C_MODE_START #if defined(HAVE_STACKTRACE) || defined(HAVE_BACKTRACE) void my_init_stacktrace(); void my_print_stacktrace(uchar* stack_bottom, ulong thread_stack); -void my_safe_print_str(const char* val, int max_len); +int my_safe_print_str(const char* val, int max_len); void my_write_core(int sig); #if BACKTRACE_DEMANGLE char *my_demangle(const char *mangled_name, int *status); |