diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-12-12 18:14:14 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-12-12 18:14:14 +0100 |
| commit | ca083a764f14233dfd7f97436629020901bd23a6 (patch) | |
| tree | c75d75920a1e1c692f75c2bef49d65cc175bf33a /mysys/my_addr_resolve.c | |
| parent | c47dd98f90230b1c08c36c66f87f4d1a45354e13 (diff) | |
| download | mariadb-git-ca083a764f14233dfd7f97436629020901bd23a6.tar.gz | |
my_addr_resolve: don't resolve unknown addresses to ??:0(??), but return an error instead
(better to have an address in the output than ??:0)
Diffstat (limited to 'mysys/my_addr_resolve.c')
| -rw-r--r-- | mysys/my_addr_resolve.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysys/my_addr_resolve.c b/mysys/my_addr_resolve.c index e5a3a5fe13b..90e6f43f390 100644 --- a/mysys/my_addr_resolve.c +++ b/mysys/my_addr_resolve.c @@ -153,6 +153,10 @@ int my_addr_resolve(void *ptr, my_addr_loc *loc) while (*s != ':') s++; *s++= 0; + + if (strcmp(loc->file, "??") == 0) + return 1; + loc->line= 0; while (isdigit(*s)) loc->line = loc->line * 10 + (*s++ - '0'); |