diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-12-15 15:57:26 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-12-15 15:57:26 +0100 |
| commit | 6bf10fac445d73fb796d4863612c87bff5f28b66 (patch) | |
| tree | 4d51e193684163c21e47e9de6536cd8dae0613eb /mysys | |
| parent | 8efaff4959efe32ff9bc47c1bf1710cfe9ab21b5 (diff) | |
| parent | 39a8d7965d912d8fb32436735449ce04e85583d1 (diff) | |
| download | mariadb-git-6bf10fac445d73fb796d4863612c87bff5f28b66.tar.gz | |
5.5 merge
Diffstat (limited to 'mysys')
| -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'); |