diff options
author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-07 17:11:22 +0300 |
---|---|---|
committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-07 17:11:22 +0300 |
commit | 4c89cff5582e786d1cde40b75c2290c136e64e31 (patch) | |
tree | 098edebe3e6e97ca234bf8842580851f807cd57a /mysys/my_addr_resolve.c | |
parent | 4ede2fec4cb7165a469776bfdbf247db86acb297 (diff) | |
parent | 400a8eb60f832030a04a248e2c96552aa3f44055 (diff) | |
download | mariadb-git-4c89cff5582e786d1cde40b75c2290c136e64e31.tar.gz |
Merge branch '10.0' into 10.1
Diffstat (limited to 'mysys/my_addr_resolve.c')
-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 82043dc03fe..b82792fc4b5 100644 --- a/mysys/my_addr_resolve.c +++ b/mysys/my_addr_resolve.c @@ -214,7 +214,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; |