diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-03 18:08:30 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-03 18:08:30 +0300 |
| commit | 6a72b9096a9aa793571159ca9aa8fbc7fdf743b1 (patch) | |
| tree | d02fcab11100ed4605c9cbb336b323e6805b59db /mysys | |
| parent | 8ffbb825e6a09d3055f46ed4b456573aef5c474c (diff) | |
| parent | f5369faf5bbfb56b5e945836eb3f7c7ee88b4079 (diff) | |
| download | mariadb-git-6a72b9096a9aa793571159ca9aa8fbc7fdf743b1.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_addr_resolve.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_addr_resolve.c b/mysys/my_addr_resolve.c index f831ad5121f..02f71fd72bd 100644 --- a/mysys/my_addr_resolve.c +++ b/mysys/my_addr_resolve.c @@ -204,7 +204,7 @@ int my_addr_resolve(void *ptr, my_addr_loc *loc) strnmov(addr2line_binary, info.dli_fname, sizeof(addr2line_binary)); } offset = info.dli_fbase; - len= my_snprintf(input, sizeof(input), "%p\n", ptr - offset); + len= my_snprintf(input, sizeof(input), "%08x\n", (ulonglong)(ptr - offset)); if (write(in[1], input, len) <= 0) return 1; if (read(out[0], output, sizeof(output)) <= 0) |