diff --git a/src/share/mysql_errno.h b/src/share/mysql_errno.h
index dc9d0e746c..0a43b402d9 100644
--- a/src/share/mysql_errno.h
+++ b/src/share/mysql_errno.h
@@ -956,6 +956,7 @@
 #define ER_TOO_BIG_ENUM 3504
 #define ER_TOO_LONG_SET_ENUM_VALUE 3505
 #define ER_TOO_MANY_TENANT_PARTITIONS_ERROR 3506
+#define ER_TABLESPACE_NOT_EXIST 3510
 
 //for cte table
 #define ER_CTE_RECURSIVE_REQUIRES_UNION 3573
diff --git a/src/share/ob_errno.cpp b/src/share/ob_errno.cpp
index e1d4747d9e..c5ed04541e 100644
--- a/src/share/ob_errno.cpp
+++ b/src/share/ob_errno.cpp
@@ -3817,13 +3817,13 @@ static const _error _error_OB_TABLESPACE_NOT_EXIST = {
       .error_name            = "OB_TABLESPACE_NOT_EXIST",
       .error_cause           = "Internal Error",
       .error_solution        = "Contact OceanBase Support",
-      .mysql_errno           = -1,
+      .mysql_errno           = ER_TABLESPACE_NOT_EXIST,
       .sqlstate              = "HY000",
-      .str_error             = "tablespace does not exist",
-      .str_user_error        = "tablespace '%.*s' does not exist",
+      .str_error             = "Tablespace does not exist",
+      .str_user_error        = "Tablespace '%.*s' does not exist",
       .oracle_errno          = 959,
-      .oracle_str_error      = "ORA-00959: tablespace does not exist",
-      .oracle_str_user_error = "ORA-00959: tablespace '%.*s' does not exist"
+      .oracle_str_error      = "ORA-00959: Tablespace does not exist",
+      .oracle_str_user_error = "ORA-00959: Tablespace '%.*s' does not exist"
 };
 static const _error _error_OB_TABLESPACE_DELETE_NOT_EMPTY = {
       .error_name            = "OB_TABLESPACE_DELETE_NOT_EMPTY",
diff --git a/src/share/ob_errno.def b/src/share/ob_errno.def
index 40791bd1a4..a69dbefa3b 100755
--- a/src/share/ob_errno.def
+++ b/src/share/ob_errno.def
@@ -423,7 +423,7 @@ DEFINE_ERROR(OB_KEYSTORE_EXIST, -4350, -1, "HY000", "the keystore already exists
 DEFINE_ERROR(OB_KEYSTORE_NOT_EXIST, -4351, -1, "HY000", "the keystore is not exist");
 DEFINE_ERROR(OB_KEYSTORE_WRONG_PASSWORD, -4352, -1, "HY000", "the password is wrong for keystore");
 DEFINE_ORACLE_ERROR_EXT(OB_TABLESPACE_EXIST, -4353, -1, "HY000", "tablespace already exists", "tablespace '%.*s' already exists", 1543, "tablespace already exists", "tablespace '%.*s' already exists");
-DEFINE_ORACLE_ERROR_EXT(OB_TABLESPACE_NOT_EXIST, -4354, -1, "HY000", "tablespace does not exist", "tablespace '%.*s' does not exist", 959, "tablespace does not exist", "tablespace '%.*s' does not exist");
+DEFINE_ORACLE_ERROR_EXT(OB_TABLESPACE_NOT_EXIST, -4354, ER_TABLESPACE_NOT_EXIST, "HY000", "Tablespace does not exist", "Tablespace '%.*s' does not exist", 959, "Tablespace does not exist", "Tablespace '%.*s' does not exist");
 DEFINE_ERROR(OB_TABLESPACE_DELETE_NOT_EMPTY, -4355, -1, "HY000", "cannot delete a tablespace which is not empty");
 DEFINE_ORACLE_ERROR(OB_FLOAT_PRECISION_OUT_RANGE, -4356, -1, "HY000", "floating point precision is out of range (1 to 126)", 1724, "floating point precision is out of range (1 to 126)");
 DEFINE_ORACLE_ERROR(OB_NUMERIC_PRECISION_OUT_RANGE, -4357, -1, "HY000", "numeric precision specifier is out of range (1 to 38)", 1727, "numeric precision specifier is out of range (1 to 38)");
diff --git a/src/share/ob_errno.h b/src/share/ob_errno.h
index a9443b5f5e..d5bc97c706 100644
--- a/src/share/ob_errno.h
+++ b/src/share/ob_errno.h
@@ -2177,7 +2177,7 @@ constexpr int OB_ERR_INVALID_DATE_MSG_FMT_V2 = -4219;
 #define OB_KEYSTORE_NOT_EXIST__USER_ERROR_MSG "the keystore is not exist"
 #define OB_KEYSTORE_WRONG_PASSWORD__USER_ERROR_MSG "the password is wrong for keystore"
 #define OB_TABLESPACE_EXIST__USER_ERROR_MSG "tablespace '%.*s' already exists"
-#define OB_TABLESPACE_NOT_EXIST__USER_ERROR_MSG "tablespace '%.*s' does not exist"
+#define OB_TABLESPACE_NOT_EXIST__USER_ERROR_MSG "Tablespace '%.*s' does not exist"
 #define OB_TABLESPACE_DELETE_NOT_EMPTY__USER_ERROR_MSG "cannot delete a tablespace which is not empty"
 #define OB_FLOAT_PRECISION_OUT_RANGE__USER_ERROR_MSG "floating point precision is out of range (1 to 126)"
 #define OB_NUMERIC_PRECISION_OUT_RANGE__USER_ERROR_MSG "numeric precision specifier is out of range (1 to 38)"
@@ -4404,7 +4404,7 @@ constexpr int OB_ERR_INVALID_DATE_MSG_FMT_V2 = -4219;
 #define OB_KEYSTORE_NOT_EXIST__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -4351, the keystore is not exist"
 #define OB_KEYSTORE_WRONG_PASSWORD__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -4352, the password is wrong for keystore"
 #define OB_TABLESPACE_EXIST__ORA_USER_ERROR_MSG "ORA-01543: tablespace '%.*s' already exists"
-#define OB_TABLESPACE_NOT_EXIST__ORA_USER_ERROR_MSG "ORA-00959: tablespace '%.*s' does not exist"
+#define OB_TABLESPACE_NOT_EXIST__ORA_USER_ERROR_MSG "ORA-00959: Tablespace '%.*s' does not exist"
 #define OB_TABLESPACE_DELETE_NOT_EMPTY__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -4355, cannot delete a tablespace which is not empty"
 #define OB_FLOAT_PRECISION_OUT_RANGE__ORA_USER_ERROR_MSG "ORA-01724: floating point precision is out of range (1 to 126)"
 #define OB_NUMERIC_PRECISION_OUT_RANGE__ORA_USER_ERROR_MSG "ORA-01727: numeric precision specifier is out of range (1 to 38)"