1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug#42735: dbug treated duplicate keywords (-#d,kw,kw) incorrectly

Browse Source
This commit is contained in:
Sergei Golubchik 2009-02-10 19:13:24 +01:00
parent f0261aca0b
commit d5c0d25792
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dbug/dbug.c
View File

@ -1451,7 +1451,9 @@ next:
{ {
if (!strncmp((*cur)->str, start, len)) if (!strncmp((*cur)->str, start, len))
{ {
if (todo == EXCLUDE) if ((*cur)->flags & todo) /* same action ? */
(*cur)->flags|= subdir; /* just merge the SUBDIR flag */
else if (todo == EXCLUDE)
{ {
struct link *delme=*cur; struct link *delme=*cur;
*cur=(*cur)->next_link; *cur=(*cur)->next_link;

11
dbug/tests-t.pl
View File

@ -483,3 +483,14 @@ func2: info: s=ko
| | <func3 | | <func3
| <func2 | <func2
<main <main
# repeated keyword
% ./tests d:-d,info,info
=> execute
=> evaluate: ON
=> evaluate_if: OFF
main: explain: dbug explained: d:-d,info
% ./tests d:-d,info/,info
=> execute
=> evaluate: ON
=> evaluate_if: OFF
main: explain: dbug explained: d:-d,info/