hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix mariadb header paths when using pkgconfig

Browse Source
This commit is contained in:
Xiaotian Wu
2022-03-16 12:49:15 +08:00
committed by Xiaotian Wu
parent 9930bc7f54
commit eea37359b9
15 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deps/oblib/src/lib/mysqlclient/ob_mysql_connection.h vendored
View File

@ -13,7 +13,7 @@
#ifndef __COMMON_OB_MYSQL_CONNECTION__
#define __COMMON_OB_MYSQL_CONNECTION__
#include <mariadb/mysql.h>
#include <mysql/mysql.h>
#include "lib/mysqlclient/ob_isql_connection.h"
#include "lib/mysqlclient/ob_mysql_statement.h"
#include "lib/container/ob_se_array.h"

2
deps/oblib/src/lib/mysqlclient/ob_mysql_connection_pool.h vendored
View File

@ -13,7 +13,7 @@
#ifndef __COMMON_OB_MYSQL_CONNECTION_POOL__
#define __COMMON_OB_MYSQL_CONNECTION_POOL__
#include <mariadb/mysql.h>
#include <mysql/mysql.h>
#include "lib/container/ob_se_array.h"
#include "lib/task/ob_timer.h"
#include "lib/list/ob_list.h"

2
deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_param.cpp vendored
View File

@ -11,7 +11,7 @@
*/
#define USING_LOG_PREFIX LIB_MYSQLC
#include <mariadb/mysql.h>
#include <mysql/mysql.h>
#include "lib/ob_define.h"
#include "lib/allocator/ob_malloc.h"
#include "lib/mysqlclient/ob_mysql_prepared_statement.h"

2
deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_param.h vendored
View File

@ -13,7 +13,7 @@
#ifndef __OB_COMMON_SQLCLIENT_MYSQL_PREPARED_PARAM__
#define __OB_COMMON_SQLCLIENT_MYSQL_PREPARED_PARAM__
#include <mariadb/mysql.h>
#include <mysql/mysql.h>
#include "lib/string/ob_string.h"
#include "lib/mysqlclient/ob_mysql_connection.h"
#include "lib/mysqlclient/ob_mysql_result.h"

2
deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_result.cpp vendored
View File

@ -11,7 +11,7 @@
*/
#define USING_LOG_PREFIX LIB_MYSQLC
#include <mariadb/mysql.h>
#include <mysql/mysql.h>
#include "lib/ob_define.h"
#include "lib/allocator/ob_malloc.h"
#include "lib/mysqlclient/ob_mysql_prepared_result.h"

2
deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_result.h vendored
View File

@ -13,7 +13,7 @@
#ifndef __OB_COMMON_SQLCLIENT_OB_MYSQL_PREPARED_RESULT__
#define __OB_COMMON_SQLCLIENT_OB_MYSQL_PREPARED_RESULT__
#include <mariadb/mysql.h>
#include <mysql/mysql.h>
#include "lib/string/ob_string.h"
#include "lib/mysqlclient/ob_mysql_connection.h"
#include "lib/mysqlclient/ob_mysql_result.h"

2
deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_statement.cpp vendored
View File

@ -11,7 +11,7 @@
*/
#define USING_LOG_PREFIX LIB_MYSQLC
#include <mariadb/mysql.h>
#include <mysql/mysql.h>
#include "lib/string/ob_string.h"
#include "lib/mysqlclient/ob_mysql_connection.h"
#include "lib/mysqlclient/ob_mysql_prepared_param.h"

2
deps/oblib/src/lib/mysqlclient/ob_mysql_prepared_statement.h vendored
View File

@ -13,7 +13,7 @@
#ifndef __OB_COMMON_SQLCLIENT_OB_MYSQL_PREPARED_STATEMENT__
#define __OB_COMMON_SQLCLIENT_OB_MYSQL_PREPARED_STATEMENT__
#include <mariadb/mysql.h>
#include <mysql/mysql.h>
#include "lib/string/ob_string.h"
#include "lib/allocator/ob_malloc.h"
#include "lib/mysqlclient/ob_mysql_connection.h"

2
deps/oblib/src/lib/mysqlclient/ob_mysql_result_impl.cpp vendored
View File

@ -11,7 +11,7 @@
*/
#define USING_LOG_PREFIX LIB_MYSQLC
#include <mariadb/mysql.h>
#include <mysql/mysql.h>
#include "lib/ob_define.h"
#include "lib/mysqlclient/ob_mysql_result.h"
#include "lib/mysqlclient/ob_mysql_statement.h"

2
deps/oblib/src/lib/mysqlclient/ob_mysql_result_impl.h vendored
View File

@ -12,7 +12,7 @@
#ifndef __OB_COMMON_SQLCLIENT_OB_MYSQL_RESULT__
#define __OB_COMMON_SQLCLIENT_OB_MYSQL_RESULT__
#include <mariadb/mysql.h>
#include <mysql/mysql.h>
#include "lib/mysqlclient/ob_mysql_result.h"
#include "rpc/obmysql/ob_mysql_global.h"

2
deps/oblib/src/lib/mysqlclient/ob_mysql_statement.cpp vendored
View File

@ -11,7 +11,7 @@
*/
#define USING_LOG_PREFIX LIB_MYSQLC
#include <mariadb/mysql.h>
#include <mysql/mysql.h>
#include "lib/mysqlclient/ob_mysql_connection.h"
#include "lib/mysqlclient/ob_mysql_result.h"
#include "lib/mysqlclient/ob_mysql_statement.h"

2
deps/oblib/src/lib/mysqlclient/ob_server_connection_pool.h vendored
View File

@ -13,7 +13,7 @@
#ifndef __COMMON_OB_SERVER_CONNECTION_POOL__
#define __COMMON_OB_SERVER_CONNECTION_POOL__
#include <mariadb/mysql.h>
#include <mysql/mysql.h>
#include "lib/lock/ob_spin_lock.h"
#include "lib/mysqlclient/ob_connection_allocator.h"
#include "lib/mysqlclient/ob_mysql_connection.h"

2
deps/oblib/src/lib/mysqlclient/ob_single_mysql_connection_pool.h vendored
View File

@ -12,7 +12,7 @@
#ifndef OCEANBASE_SINGLE_MYSQL_CONNECTION_POOL_H_
#define OCEANBASE_SINGLE_MYSQL_CONNECTION_POOL_H_
#include <mariadb/mysql.h>
#include <mysql/mysql.h>
#include "lib/container/ob_se_array.h"
#include "lib/list/ob_list.h"
#include "lib/allocator/ob_cached_allocator.h"

6
src/share/mysql_errno.h
View File

@ -13,13 +13,15 @@
#ifndef _OBMYSQL_ERRNO_H_
#define _OBMYSQL_ERRNO_H_
#include <mariadb/mysqld_error.h>
#include <mysql/mysqld_error.h>
#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

4
tools/obcdc/src/ob_log_mysql_connector.h
View File

@ -13,8 +13,8 @@
#ifndef OCEANBASE_LIBOBLOG_OB_LOG_MYSQL_CONNECTOR_H_
#define OCEANBASE_LIBOBLOG_OB_LOG_MYSQL_CONNECTOR_H_
#include <mariadb/mysql.h>
#include <mariadb/errmsg.h>
#include <mysql/mysql.h>
#include <mysql/errmsg.h>
#include "share/ob_define.h" // OB_MAX_*
#include "lib/utility/ob_print_utils.h" // TO_STRING_KV