diff options
author | unknown <serg@janus.mylan> | 2007-01-28 21:11:42 +0100 |
---|---|---|
committer | unknown <serg@janus.mylan> | 2007-01-28 21:11:42 +0100 |
commit | 2a8ee9fb135243403a29f0de6cb26b2128b17387 (patch) | |
tree | 6e36d1c810037d8a679feec2df470f30ca897a05 /dbug/dbug.c | |
parent | 60f0cd8b13b73a99b4e4d843e7720526e27c9726 (diff) | |
download | mariadb-git-2a8ee9fb135243403a29f0de6cb26b2128b17387.tar.gz |
dbug: don't consider double colom (::) a separator -
it can be part of a function name (Item::reset)
Diffstat (limited to 'dbug/dbug.c')
-rw-r--r-- | dbug/dbug.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/dbug/dbug.c b/dbug/dbug.c index ef63f660543..c212e9117a1 100644 --- a/dbug/dbug.c +++ b/dbug/dbug.c @@ -1995,12 +1995,14 @@ static char *DbugMalloc(size_t size) /* - * strtok lookalike - splits on ':', magically handles :\ and :/ + * strtok lookalike - splits on ':', magically handles ::, :\ and :/ */ static const char *DbugStrTok(const char *s) { - while (s[0] && (s[0] != ':' || (s[1] == '\\' || s[1] == '/'))) + const char *start=s; + while (s[0] && (s[0] != ':' || + (s[1] == '\\' || s[1] == '/' || (s[1] == ':' && s++)))) s++; return s; } |