From 2943edef86e2a540524eab67f5fc789df9ea31f3 Mon Sep 17 00:00:00 2001
From: zhengxue <zhengxue6@huawei.com>
Date: Wed, 30 Dec 2020 18:47:10 +0800
Subject: [PATCH] fix bug

---
 src/common/backend/utils/misc/guc.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/common/backend/utils/misc/guc.cpp b/src/common/backend/utils/misc/guc.cpp
index 8f74e6231..436e6c511 100644
--- a/src/common/backend/utils/misc/guc.cpp
+++ b/src/common/backend/utils/misc/guc.cpp
@@ -18220,12 +18220,14 @@ int find_guc_option(
         if (isOptLineCommented(optlines[i])) {
             isMatched = isMatchOptionName(optlines[i], opt_name, paramlen, name_offset, value_len, value_offset);
             if (isMatched) {
-                return i;
+                matchtimes++;
+                targetline = i;
             }
         }
     }
 
-    return INVALID_LINES_IDX;
+    /* The line of last one will be returned, otherwise it return invaild line */
+    return (matchtimes > 0) ? targetline : INVALID_LINES_IDX;
 }
 /*
  * @@GaussDB@@