From ca31dfde0f6e9354d5bffeaa74860e809c81f236 Mon Sep 17 00:00:00 2001
From: obdev <obdev@oceanbase.com>
Date: Wed, 26 Apr 2023 13:21:55 +0000
Subject: [PATCH] fix no wait const param is not consistent in fp and np

---
 src/sql/parser/ob_fast_parser.cpp      | 22 ----------------------
 src/sql/parser/sql_parser_mysql_mode.l |  9 +--------
 2 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/src/sql/parser/ob_fast_parser.cpp b/src/sql/parser/ob_fast_parser.cpp
index 469d359e5f..f82a0fa950 100644
--- a/src/sql/parser/ob_fast_parser.cpp
+++ b/src/sql/parser/ob_fast_parser.cpp
@@ -2042,19 +2042,6 @@ int ObFastParserMysql::process_identifier_begin_with_n()
       OZ (add_null_type_node());
     }
   } else {
-    bool is_nowait = false;
-    if (CHECK_EQ_STRNCASECMP("o_wait", 6)) {
-      is_nowait = true;
-      cur_token_type_ = PARAM_TOKEN;
-      raw_sql_.scan(6);
-    } else if (CHECK_EQ_STRNCASECMP("owait", 5)) {
-      is_nowait = true;
-      cur_token_type_ = PARAM_TOKEN;
-      raw_sql_.scan(5);
-    }
-    if (is_nowait && OB_FAIL(add_nowait_type_node())) {
-      LOG_WARN("failed to add nowait node info", K(ret));
-    }
   }
   return ret;
 }
@@ -2453,15 +2440,6 @@ int ObFastParserOracle::process_identifier_begin_with_n()
       }
     }
   } else {
-    bool is_nowait = false;
-    if (CHECK_EQ_STRNCASECMP("owait", 5)) {
-      is_nowait = true;
-      cur_token_type_ = PARAM_TOKEN;
-      raw_sql_.scan(5);
-    }
-    if (is_nowait && OB_FAIL(add_nowait_type_node())) {
-      LOG_WARN("failed to add nowait node info", K(ret));
-    }
   }
   return ret;
 }
diff --git a/src/sql/parser/sql_parser_mysql_mode.l b/src/sql/parser/sql_parser_mysql_mode.l
index 85b4994619..506479ade5 100755
--- a/src/sql/parser/sql_parser_mysql_mode.l
+++ b/src/sql/parser/sql_parser_mysql_mode.l
@@ -1488,14 +1488,7 @@ BEGIN(in_c_comment);
   if (IS_FAST_PARAMETERIZE) {
     ParseResult *p = (ParseResult *)yyextra;
     REPUT_NEG_SIGN(p);
-    if (strcasecmp("nowait", yytext) == 0
-        || strcasecmp("no_wait", yytext) == 0) {
-      //语法阶段for update nowait 会给默认值0，所以如果是fast parse也需要给0, 从而保证常量个数识别的一致性
-      char num[2] = "0";
-      STORE_UNIT_TYPE_NODE(num);
-    } else {
-      return NAME_OB;
-    }
+    return NAME_OB;
   } else {
     int ret = NAME_OB;
     if (NULL == (word = mysql_non_reserved_keyword_lookup(yytext)))