mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
dbug: don't consider double colom (::) a separator -
it can be part of a function name (Item::reset)
This commit is contained in:
@ -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)
|
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++;
|
s++;
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
|
11
dbug/user.r
11
dbug/user.r
@ -908,9 +908,10 @@ via the
|
|||||||
.B DBUG_PUSH
|
.B DBUG_PUSH
|
||||||
or
|
or
|
||||||
.B DBUG_SET
|
.B DBUG_SET
|
||||||
macros. Control string consists of colon separate flags. A flag
|
macros. Control string consists of colon separate flags. Colons
|
||||||
may take an argument or a list of arguments. If a control string
|
that are part of ':\\', ':/', or '::' are not considered flag
|
||||||
starts from a '+' sign it works
|
separators. A flag may take an argument or a list of arguments.
|
||||||
|
If a control string starts from a '+' sign it works
|
||||||
.I incrementally,
|
.I incrementally,
|
||||||
that is, it can modify existing state without overriding it. In such a
|
that is, it can modify existing state without overriding it. In such a
|
||||||
string every flag may be preceded by a '+' or '-' to enable or disable
|
string every flag may be preceded by a '+' or '-' to enable or disable
|
||||||
@ -923,9 +924,7 @@ optional.
|
|||||||
.LI a[,file]
|
.LI a[,file]
|
||||||
Redirect the debugger output stream and append it to the specified
|
Redirect the debugger output stream and append it to the specified
|
||||||
file. The default output stream is stderr. A null argument list
|
file. The default output stream is stderr. A null argument list
|
||||||
causes output to be redirected to stdout. A colon that is followed by
|
causes output to be redirected to stdout.
|
||||||
the '\\' or '/' is cosidered a part of the path and not a flag
|
|
||||||
separator.
|
|
||||||
.SP 1
|
.SP 1
|
||||||
EX: \fCa,C:\\tmp\\log\fR
|
EX: \fCa,C:\\tmp\\log\fR
|
||||||
.LI A[,file]
|
.LI A[,file]
|
||||||
|
Reference in New Issue
Block a user