From 40c236b0761bd155363e5fb9d0228daacd6ab928 Mon Sep 17 00:00:00 2001 From: Xiaotian Wu Date: Wed, 16 Mar 2022 12:49:15 +0800 Subject: [PATCH] Fix mariadb header paths when using pkgconfig --- deps/oblib/src/lib/mysqlclient/ob_mysql_connection.h | 2 +- deps/oblib/src/lib/mysqlclient/ob_mysql_connection_pool.h | 2 +- deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_param.cpp | 2 +- deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_param.h | 2 +- .../oblib/src/lib/mysqlclient/ob_mysql_prepared_result.cpp | 3 +-- deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_result.h | 2 +- .../src/lib/mysqlclient/ob_mysql_prepared_statement.cpp | 2 +- .../src/lib/mysqlclient/ob_mysql_prepared_statement.h | 2 +- deps/oblib/src/lib/mysqlclient/ob_mysql_result_impl.cpp | 2 +- deps/oblib/src/lib/mysqlclient/ob_mysql_result_impl.h | 2 +- deps/oblib/src/lib/mysqlclient/ob_mysql_statement.cpp | 2 +- deps/oblib/src/lib/mysqlclient/ob_server_connection_pool.h | 2 +- .../src/lib/mysqlclient/ob_single_mysql_connection_pool.h | 2 +- src/logservice/libobcdc/src/ob_log_mysql_connector.h | 4 ++-- src/share/mysql_errno.h | 7 +++++++ 15 files changed, 22 insertions(+), 16 deletions(-) diff --git a/deps/oblib/src/lib/mysqlclient/ob_mysql_connection.h b/deps/oblib/src/lib/mysqlclient/ob_mysql_connection.h index e77502a79..a777b4a74 100644 --- a/deps/oblib/src/lib/mysqlclient/ob_mysql_connection.h +++ b/deps/oblib/src/lib/mysqlclient/ob_mysql_connection.h @@ -13,7 +13,7 @@ #ifndef __COMMON_OB_MYSQL_CONNECTION__ #define __COMMON_OB_MYSQL_CONNECTION__ -#include +#include #include "lib/mysqlclient/ob_isql_connection.h" #include "lib/mysqlclient/ob_mysql_statement.h" #include "lib/container/ob_se_array.h" diff --git a/deps/oblib/src/lib/mysqlclient/ob_mysql_connection_pool.h b/deps/oblib/src/lib/mysqlclient/ob_mysql_connection_pool.h index e7ad2b4cc..969e03329 100644 --- a/deps/oblib/src/lib/mysqlclient/ob_mysql_connection_pool.h +++ b/deps/oblib/src/lib/mysqlclient/ob_mysql_connection_pool.h @@ -13,7 +13,7 @@ #ifndef __COMMON_OB_MYSQL_CONNECTION_POOL__ #define __COMMON_OB_MYSQL_CONNECTION_POOL__ -#include +#include #include "lib/container/ob_se_array.h" #include "lib/hash/ob_link_hashmap.h" // ObLinkHashMap #include "lib/task/ob_timer.h" diff --git a/deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_param.cpp b/deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_param.cpp index 89d2a3da2..49b64e268 100644 --- a/deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_param.cpp +++ b/deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_param.cpp @@ -12,7 +12,7 @@ #define USING_LOG_PREFIX LIB_MYSQLC #include "lib/mysqlclient/ob_isql_connection_pool.h" -#include +#include #include "lib/ob_define.h" #include "lib/allocator/ob_malloc.h" #include "lib/mysqlclient/ob_mysql_prepared_statement.h" diff --git a/deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_param.h b/deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_param.h index 3a9f11175..1903558b4 100644 --- a/deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_param.h +++ b/deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_param.h @@ -13,7 +13,7 @@ #ifndef __OB_COMMON_SQLCLIENT_MYSQL_PREPARED_PARAM__ #define __OB_COMMON_SQLCLIENT_MYSQL_PREPARED_PARAM__ -#include +#include #include "lib/string/ob_string.h" #include "lib/mysqlclient/ob_mysql_connection.h" #include "lib/mysqlclient/ob_mysql_result.h" diff --git a/deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_result.cpp b/deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_result.cpp index 0a8e904eb..a97b4cb93 100644 --- a/deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_result.cpp +++ b/deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_result.cpp @@ -11,9 +11,8 @@ */ #define USING_LOG_PREFIX LIB_MYSQLC - #include "lib/mysqlclient/ob_isql_connection_pool.h" -#include +#include #include "lib/ob_define.h" #include "lib/allocator/ob_malloc.h" #include "lib/mysqlclient/ob_mysql_prepared_result.h" diff --git a/deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_result.h b/deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_result.h index f5c7f0e37..ef68b3055 100644 --- a/deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_result.h +++ b/deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_result.h @@ -13,7 +13,7 @@ #ifndef __OB_COMMON_SQLCLIENT_OB_MYSQL_PREPARED_RESULT__ #define __OB_COMMON_SQLCLIENT_OB_MYSQL_PREPARED_RESULT__ -#include +#include #include "lib/string/ob_string.h" #include "lib/mysqlclient/ob_mysql_connection.h" #include "lib/mysqlclient/ob_mysql_result.h" diff --git a/deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_statement.cpp b/deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_statement.cpp index 0e4acc102..2ae5917e1 100644 --- a/deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_statement.cpp +++ b/deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_statement.cpp @@ -12,7 +12,7 @@ #define USING_LOG_PREFIX LIB_MYSQLC #include "lib/mysqlclient/ob_isql_connection_pool.h" -#include +#include #include "lib/string/ob_string.h" #include "lib/mysqlclient/ob_mysql_connection.h" #include "lib/mysqlclient/ob_mysql_prepared_param.h" diff --git a/deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_statement.h b/deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_statement.h index 1afd6bdf4..f6b24c4ac 100644 --- a/deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_statement.h +++ b/deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_statement.h @@ -13,7 +13,7 @@ #ifndef __OB_COMMON_SQLCLIENT_OB_MYSQL_PREPARED_STATEMENT__ #define __OB_COMMON_SQLCLIENT_OB_MYSQL_PREPARED_STATEMENT__ -#include +#include #include "lib/string/ob_string.h" #include "lib/allocator/ob_malloc.h" #include "lib/mysqlclient/ob_mysql_connection.h" diff --git a/deps/oblib/src/lib/mysqlclient/ob_mysql_result_impl.cpp b/deps/oblib/src/lib/mysqlclient/ob_mysql_result_impl.cpp index 30d6692af..310ba08ee 100644 --- a/deps/oblib/src/lib/mysqlclient/ob_mysql_result_impl.cpp +++ b/deps/oblib/src/lib/mysqlclient/ob_mysql_result_impl.cpp @@ -12,7 +12,7 @@ #define USING_LOG_PREFIX LIB_MYSQLC #include "lib/mysqlclient/ob_isql_connection_pool.h" -#include +#include #include "lib/ob_define.h" #include "lib/mysqlclient/ob_mysql_result.h" #include "lib/mysqlclient/ob_mysql_statement.h" diff --git a/deps/oblib/src/lib/mysqlclient/ob_mysql_result_impl.h b/deps/oblib/src/lib/mysqlclient/ob_mysql_result_impl.h index 4a21de78b..4446db58d 100644 --- a/deps/oblib/src/lib/mysqlclient/ob_mysql_result_impl.h +++ b/deps/oblib/src/lib/mysqlclient/ob_mysql_result_impl.h @@ -12,7 +12,7 @@ #ifndef __OB_COMMON_SQLCLIENT_OB_MYSQL_RESULT__ #define __OB_COMMON_SQLCLIENT_OB_MYSQL_RESULT__ -#include +#include #include "lib/mysqlclient/ob_mysql_result.h" #include "rpc/obmysql/ob_mysql_global.h" diff --git a/deps/oblib/src/lib/mysqlclient/ob_mysql_statement.cpp b/deps/oblib/src/lib/mysqlclient/ob_mysql_statement.cpp index 68e0fd67c..5509c010f 100644 --- a/deps/oblib/src/lib/mysqlclient/ob_mysql_statement.cpp +++ b/deps/oblib/src/lib/mysqlclient/ob_mysql_statement.cpp @@ -12,7 +12,7 @@ #define USING_LOG_PREFIX LIB_MYSQLC #include "lib/mysqlclient/ob_isql_connection_pool.h" -#include +#include #include "lib/mysqlclient/ob_mysql_connection.h" #include "lib/mysqlclient/ob_mysql_result.h" #include "lib/mysqlclient/ob_mysql_statement.h" diff --git a/deps/oblib/src/lib/mysqlclient/ob_server_connection_pool.h b/deps/oblib/src/lib/mysqlclient/ob_server_connection_pool.h index a1d2ce306..caee5efa2 100644 --- a/deps/oblib/src/lib/mysqlclient/ob_server_connection_pool.h +++ b/deps/oblib/src/lib/mysqlclient/ob_server_connection_pool.h @@ -13,7 +13,7 @@ #ifndef __COMMON_OB_SERVER_CONNECTION_POOL__ #define __COMMON_OB_SERVER_CONNECTION_POOL__ -#include +#include #include "lib/lock/ob_spin_lock.h" #include "lib/mysqlclient/ob_connection_allocator.h" #include "lib/mysqlclient/ob_mysql_connection.h" diff --git a/deps/oblib/src/lib/mysqlclient/ob_single_mysql_connection_pool.h b/deps/oblib/src/lib/mysqlclient/ob_single_mysql_connection_pool.h index e3b12b86e..61f67e714 100644 --- a/deps/oblib/src/lib/mysqlclient/ob_single_mysql_connection_pool.h +++ b/deps/oblib/src/lib/mysqlclient/ob_single_mysql_connection_pool.h @@ -12,7 +12,7 @@ #ifndef OCEANBASE_SINGLE_MYSQL_CONNECTION_POOL_H_ #define OCEANBASE_SINGLE_MYSQL_CONNECTION_POOL_H_ -#include +#include #include "lib/container/ob_se_array.h" #include "lib/list/ob_list.h" #include "lib/allocator/ob_cached_allocator.h" diff --git a/src/logservice/libobcdc/src/ob_log_mysql_connector.h b/src/logservice/libobcdc/src/ob_log_mysql_connector.h index 93c43b2aa..5510795e2 100644 --- a/src/logservice/libobcdc/src/ob_log_mysql_connector.h +++ b/src/logservice/libobcdc/src/ob_log_mysql_connector.h @@ -15,8 +15,8 @@ #ifndef OCEANBASE_LIBOBCDC_OB_LOG_MYSQL_CONNECTOR_H_ #define OCEANBASE_LIBOBCDC_OB_LOG_MYSQL_CONNECTOR_H_ -#include -#include +#include +#include #include "share/ob_define.h" // OB_MAX_* #include "lib/utility/ob_print_utils.h" // TO_STRING_KV diff --git a/src/share/mysql_errno.h b/src/share/mysql_errno.h index 9bdaa0fb6..a45572e0f 100644 --- a/src/share/mysql_errno.h +++ b/src/share/mysql_errno.h @@ -1,5 +1,6 @@ #ifndef _MYSQL_ERRNO_H #define _MYSQL_ERRNO_H 1 +#include #define ER_ERROR_FIRST 1000 #define ER_HASHCHK 1000 @@ -924,6 +925,12 @@ #define ER_INCORRECT_TYPE 3064 #define ER_BOOST_GEOMETRY_INCONSISTENT_TURNS_EXCEPTION 3122 #define ER_GIS_MAX_POINTS_IN_GEOMETRY_OVERFLOWED 3134 +#if !defined(ER_ACCOUNT_HAS_BEEN_LOCKED) +# define ER_ACCOUNT_HAS_BEEN_LOCKED 3118 +#endif +#define ER_NON_DEFAULT_VALUE_FOR_GENERATED_COLUMN 3105 +#define ER_DEPENDENT_BY_GENERATED_COLUMN 3108 + #define ER_INVALID_JSON_TEXT 3140 #define ER_INVALID_JSON_TEXT_IN_PARAM 3141 #define ER_INVALID_JSON_BINARY_DATA 3142