From d5c0d257923221458aec7b01dbf538dbb9aaea4b Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mysql.com>
Date: Tue, 10 Feb 2009 19:13:24 +0100
Subject: Bug#42735: dbug treated duplicate keywords (-#d,kw,kw) incorrectly

---
 dbug/dbug.c     |  4 +++-
 dbug/tests-t.pl | 11 +++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'dbug')

diff --git a/dbug/dbug.c b/dbug/dbug.c
index fc2faf867e4..1e18fb3eab0 100644
--- a/dbug/dbug.c
+++ b/dbug/dbug.c
@@ -1451,7 +1451,9 @@ next:
     {
       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;
           *cur=(*cur)->next_link;
diff --git a/dbug/tests-t.pl b/dbug/tests-t.pl
index a4227e8aa07..de9ed6f6ab9 100755
--- a/dbug/tests-t.pl
+++ b/dbug/tests-t.pl
@@ -483,3 +483,14 @@ func2: info: s=ko
 | | <func3
 | <func2
 <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/
-- 
cgit v1.2.1