diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-10 17:43:18 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-10 17:43:18 +0300 |
| commit | 45e6d0aebf023acb50671f82b87e6de5d1e78f5e (patch) | |
| tree | c6079a18e158706a0a877d1b522ceb851d6055b5 /mysys | |
| parent | f5cb66fb97101bc0f17ff879025fd7146c032cbc (diff) | |
| parent | 2e91eb7547dfc7c9a999568bd8245832bbcfefaa (diff) | |
| download | mariadb-git-45e6d0aebf023acb50671f82b87e6de5d1e78f5e.tar.gz | |
Merge branch '10.1' into 10.2
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 84bff47d1a9..c16f269d574 100644 --- a/mysys/my_addr_resolve.c +++ b/mysys/my_addr_resolve.c @@ -226,7 +226,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 3; |