diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-03-26 12:33:49 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-03-26 12:33:49 +0200 |
| commit | d92009231d90cc187a89eab78bcf3ef090c5e24f (patch) | |
| tree | 31eff0c98bd6e65c4c2c7ce3e0ebc1d950a8969c /mysys | |
| parent | 485e7264a97683ca3b560d21dec6829fe284fc1d (diff) | |
| download | mariadb-git-d92009231d90cc187a89eab78bcf3ef090c5e24f.tar.gz | |
a couple of minor post-5.5-merge cleanups
include/mysql_com.h:
remove "shutdown levels" that aren't shutdown levels from mysql_enum_shutdown_level
mysys/my_addr_resolve.c:
my_snprintf in 5.5 (but not in 5.3) supports %p
sql/item_func.cc:
use a method (that exists only in 5.5) instead of directly accessing a member
sql/item_subselect.cc:
use a method (that exists only in 5.5) instead of directly accessing a member
sql/opt_subselect.cc:
use a method (that exists only in 5.5) instead of directly accessing a member
sql/sql_select.cc:
use a method (that exists only in 5.5) instead of directly accessing a member
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 f544139142b..e74845c2808 100644 --- a/mysys/my_addr_resolve.c +++ b/mysys/my_addr_resolve.c @@ -140,7 +140,7 @@ int my_addr_resolve(void *ptr, my_addr_loc *loc) char output[1024]; size_t len; - len= snprintf(input, sizeof(input), "0x%p\n", ptr); + len= my_snprintf(input, sizeof(input), "%p\n", ptr); if (write(in[1], input, len) <= 0) return 1; if (read(out[0], output, sizeof(output)) <= 0) |