From eea37359b949ca200414be23d00f77e7633ebecb 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 +- deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_result.cpp | 2 +- deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_result.h | 2 +- .../src/lib/mysqlclient/ob_mysql_prepared_statement.cpp | 2 +- .../oblib/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/share/mysql_errno.h | 6 ++++-- tools/obcdc/src/ob_log_mysql_connector.h | 4 ++-- 15 files changed, 19 insertions(+), 17 deletions(-) diff --git a/deps/oblib/src/lib/mysqlclient/ob_mysql_connection.h b/deps/oblib/src/lib/mysqlclient/ob_mysql_connection.h index 4480459e15..9ef78d2c0c 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 3b3021a596..1a650556f3 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/task/ob_timer.h" #include "lib/list/ob_list.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 ba71e27fbb..aa95b680e9 100644 --- a/deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_param.cpp +++ b/deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_param.cpp @@ -11,7 +11,7 @@ */ #define USING_LOG_PREFIX LIB_MYSQLC -#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 43e9d1ebfd..f1414cf8d0 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 e95593a8ba..e2a281f7ac 100644 --- a/deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_result.cpp +++ b/deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_result.cpp @@ -11,7 +11,7 @@ */ #define USING_LOG_PREFIX LIB_MYSQLC -#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 ff24d4bde8..7a5ee1f263 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 0d605ff23f..ddaee994dd 100644 --- a/deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_statement.cpp +++ b/deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_statement.cpp @@ -11,7 +11,7 @@ */ #define USING_LOG_PREFIX LIB_MYSQLC -#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 7be1f68e59..64fdfce8ad 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 d752e4d89f..0dc87ba224 100644 --- a/deps/oblib/src/lib/mysqlclient/ob_mysql_result_impl.cpp +++ b/deps/oblib/src/lib/mysqlclient/ob_mysql_result_impl.cpp @@ -11,7 +11,7 @@ */ #define USING_LOG_PREFIX LIB_MYSQLC -#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 7f57692383..f9a8f1a98b 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 578fd99bb0..5f8deb38d7 100644 --- a/deps/oblib/src/lib/mysqlclient/ob_mysql_statement.cpp +++ b/deps/oblib/src/lib/mysqlclient/ob_mysql_statement.cpp @@ -11,7 +11,7 @@ */ #define USING_LOG_PREFIX LIB_MYSQLC -#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 182a6dfb04..808b20d46b 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 80a4faa068..a8ae1f2513 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/share/mysql_errno.h b/src/share/mysql_errno.h index f353b309bf..5b584322c8 100644 --- a/src/share/mysql_errno.h +++ b/src/share/mysql_errno.h @@ -13,13 +13,15 @@ #ifndef _OBMYSQL_ERRNO_H_ #define _OBMYSQL_ERRNO_H_ -#include +#include #define ER_AES_INVALID_IV 1882 #define ER_OVERSIZE_NEED_RETRY 1887 #define ER_AGGREGATE_ORDER_FOR_UNION 3028 #define ER_INCORRECT_TYPE 3064 -#define ER_ACCOUNT_HAS_BEEN_LOCKED 3118 +#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 diff --git a/tools/obcdc/src/ob_log_mysql_connector.h b/tools/obcdc/src/ob_log_mysql_connector.h index f5ad980962..a73f2382ea 100644 --- a/tools/obcdc/src/ob_log_mysql_connector.h +++ b/tools/obcdc/src/ob_log_mysql_connector.h @@ -13,8 +13,8 @@ #ifndef OCEANBASE_LIBOBLOG_OB_LOG_MYSQL_CONNECTOR_H_ #define OCEANBASE_LIBOBLOG_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