From 2e200bc613222653b9dd64a32c3c969d5b9900fd Mon Sep 17 00:00:00 2001 From: obdev Date: Thu, 8 Feb 2024 14:54:04 +0000 Subject: [PATCH] [CP] check oci runtime version --- src/share/ob_errno.cpp | 8 ++++---- src/share/ob_errno.def | 2 +- src/share/ob_errno.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/share/ob_errno.cpp b/src/share/ob_errno.cpp index 7f682cd63f..b3e85bcd5c 100644 --- a/src/share/ob_errno.cpp +++ b/src/share/ob_errno.cpp @@ -17739,11 +17739,11 @@ static const _error _error_OB_ERR_DBLINK_NO_LIB = { .error_solution = "Contact OceanBase Support", .mysql_errno = -1, .sqlstate = "HY000", - .str_error = "oci lib not founded", - .str_user_error = "oci lib not founded", + .str_error = "can not find the expected version of OCI LIB: %.*s", + .str_user_error = "can not find the expected version of OCI LIB: %.*s", .oracle_errno = 600, - .oracle_str_error = "ORA-00600: internal error code, arguments: -5976, oci lib not founded", - .oracle_str_user_error = "ORA-00600: internal error code, arguments: -5976, oci lib not founded" + .oracle_str_error = "ORA-00600: internal error code, arguments: -5976, can not find the expected version of OCI LIB: %.*s", + .oracle_str_user_error = "ORA-00600: internal error code, arguments: -5976, can not find the expected version of OCI LIB: %.*s" }; static const _error _error_OB_ERR_PARTITION_EXTENDED_ON_VIEW = { .error_name = "OB_ERR_PARTITION_EXTENDED_ON_VIEW", diff --git a/src/share/ob_errno.def b/src/share/ob_errno.def index d1e7141466..4b47a3d35e 100755 --- a/src/share/ob_errno.def +++ b/src/share/ob_errno.def @@ -1628,7 +1628,7 @@ DEFINE_ERROR_EXT(OB_ERR_CHECK_OPTION_ON_NONUPDATABLE_VIEW, -5972, ER_VIEW_NONUPD DEFINE_ORACLE_ERROR(OB_ERR_NO_DESC_FOR_POS, -5973, -1, "HY000", "no descriptor for this position", 24334, "no descriptor for this position"); DEFINE_ORACLE_ERROR(OB_ERR_ILL_OBJ_FLAG, -5974, -1, "HY000", "object specified is incompatible with the flag specified", 4047, "object specified is incompatible with the flag specified"); DEFINE_ERROR_DEP(OB_ERR_DBLINK_REMOTE_ECODE, -5975, -1, "HY000", "\ndblink remote error code: %d,\nremote error msg: %.*s", "\ndblink remote error code: %d,\nremote error msg: %.*s"); -DEFINE_ERROR_DEP(OB_ERR_DBLINK_NO_LIB, -5976, -1, "HY000", "oci lib not founded"); +DEFINE_ERROR_DEP(OB_ERR_DBLINK_NO_LIB, -5976, -1, "HY000", "can not find the expected version of OCI LIB: %.*s", "can not find the expected version of OCI LIB: %.*s"); DEFINE_ORACLE_ERROR(OB_ERR_PARTITION_EXTENDED_ON_VIEW, -5977, -1, "HY000", "partition-extended object names may only be used with tables and editioning views", 14109, "partition-extended object names may only be used with tables and editioning views"); DEFINE_ORACLE_ERROR(OB_ERR_NOT_ALL_VARIABLE_BIND, -5978, -1, "HY000", "not all variables bound", 1008, "not all variables bound"); DEFINE_ORACLE_ERROR(OB_ERR_BIND_VARIABLE_NOT_EXIST, -5979, -1, "HY000", "bind variable does not exist", 1006, "bind variable does not exist"); diff --git a/src/share/ob_errno.h b/src/share/ob_errno.h index 95d4053ee5..6b047e39b9 100644 --- a/src/share/ob_errno.h +++ b/src/share/ob_errno.h @@ -3326,7 +3326,7 @@ constexpr int OB_ERR_INVALID_DATE_MSG_FMT_V2 = -4219; #define OB_ERR_NO_DESC_FOR_POS__USER_ERROR_MSG "no descriptor for this position" #define OB_ERR_ILL_OBJ_FLAG__USER_ERROR_MSG "object specified is incompatible with the flag specified" #define OB_ERR_DBLINK_REMOTE_ECODE__USER_ERROR_MSG "\ndblink remote error code: %d,\nremote error msg: %.*s" -#define OB_ERR_DBLINK_NO_LIB__USER_ERROR_MSG "oci lib not founded" +#define OB_ERR_DBLINK_NO_LIB__USER_ERROR_MSG "can not find the expected version of OCI LIB: %.*s" #define OB_ERR_PARTITION_EXTENDED_ON_VIEW__USER_ERROR_MSG "partition-extended object names may only be used with tables and editioning views" #define OB_ERR_NOT_ALL_VARIABLE_BIND__USER_ERROR_MSG "not all variables bound" #define OB_ERR_BIND_VARIABLE_NOT_EXIST__USER_ERROR_MSG "bind variable does not exist" @@ -5539,7 +5539,7 @@ constexpr int OB_ERR_INVALID_DATE_MSG_FMT_V2 = -4219; #define OB_ERR_NO_DESC_FOR_POS__ORA_USER_ERROR_MSG "ORA-24334: no descriptor for this position" #define OB_ERR_ILL_OBJ_FLAG__ORA_USER_ERROR_MSG "ORA-04047: object specified is incompatible with the flag specified" #define OB_ERR_DBLINK_REMOTE_ECODE__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -5975, \ndblink remote error code: %d,\nremote error msg: %.*s" -#define OB_ERR_DBLINK_NO_LIB__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -5976, oci lib not founded" +#define OB_ERR_DBLINK_NO_LIB__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -5976, can not find the expected version of OCI LIB: %.*s" #define OB_ERR_PARTITION_EXTENDED_ON_VIEW__ORA_USER_ERROR_MSG "ORA-14109: partition-extended object names may only be used with tables and editioning views" #define OB_ERR_NOT_ALL_VARIABLE_BIND__ORA_USER_ERROR_MSG "ORA-01008: not all variables bound" #define OB_ERR_BIND_VARIABLE_NOT_EXIST__ORA_USER_ERROR_MSG "ORA-01006: bind variable does not exist"