diff --git a/src/common/backend/parser/parser.cpp b/src/common/backend/parser/parser.cpp
index 4e3490e3a..718a71e26 100644
--- a/src/common/backend/parser/parser.cpp
+++ b/src/common/backend/parser/parser.cpp
@@ -155,7 +155,6 @@ int base_yylex(YYSTYPE* lvalp, YYLTYPE* llocp, core_yyscan_t yyscanner)
     int next_token;
     core_YYSTYPE cur_yylval;
     YYLTYPE cur_yylloc;
-    errno_t rc = 0;
 
     /* Get next token --- we might already have it */
     if (yyextra->lookahead_num != 0) {
diff --git a/src/common/interfaces/libpq/frontend_parser/gram.y b/src/common/interfaces/libpq/frontend_parser/gram.y
index 1770e1012..d3ec7cc4c 100755
--- a/src/common/interfaces/libpq/frontend_parser/gram.y
+++ b/src/common/interfaces/libpq/frontend_parser/gram.y
@@ -291,7 +291,6 @@ extern THR_LOCAL bool stmt_contains_operator_plus;
 
 %type <typnam>	func_type
 
-%type <boolean>  opt_nowait
 %type <ival>	 OptTemp opt_wait
 %type <ival>	 opt_nowait_or_skip
 %type <oncommit> OnCommitOption
@@ -7384,11 +7383,7 @@ for_locking_item:
 					$$ = (Node *) n;
 				}
 		;
-
-opt_nowait: NOWAIT                          { $$ = TRUE; }
-            | /*EMPTY*/                     { $$ = FALSE; }
-        ;
-
+		
 opt_wait:	WAIT Iconst						{ $$ = $2; }
 opt_nowait_or_skip:
 			NOWAIT							{ $$ = LockWaitError; }