diff options
Diffstat (limited to 'storage/innobase/handler/ha_innodb.h')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/storage/innobase/handler/ha_innodb.h b/storage/innobase/handler/ha_innodb.h index 57c48f28ff7..1648d7db252 100644 --- a/storage/innobase/handler/ha_innodb.h +++ b/storage/innobase/handler/ha_innodb.h @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 2000, 2017, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2013, 2018, MariaDB Corporation. +Copyright (c) 2013, 2019, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -17,6 +17,11 @@ this program; if not, write to the Free Software Foundation, Inc., *****************************************************************************/ +#ifdef WITH_WSREP +# include <mysql/service_wsrep.h> +# include "../../../wsrep/wsrep_api.h" +#endif /* WITH_WSREP */ + /* The InnoDB handler: the interface between MySQL and InnoDB. */ /** "GEN_CLUST_INDEX" is the name reserved for InnoDB default @@ -434,7 +439,7 @@ protected: dict_index_t* innobase_get_index(uint keynr); #ifdef WITH_WSREP - int wsrep_append_keys(THD *thd, bool shared, + int wsrep_append_keys(THD *thd, wsrep_key_type key_type, const uchar* record0, const uchar* record1); #endif /** Builds a 'template' to the prebuilt struct. @@ -560,7 +565,6 @@ thd_get_work_part_info( struct trx_t; #ifdef WITH_WSREP -#include <mysql/service_wsrep.h> //extern "C" int wsrep_trx_order_before(void *thd1, void *thd2); extern "C" bool wsrep_thd_is_wsrep_on(THD *thd); @@ -611,10 +615,6 @@ innobase_index_name_is_reserved( be created. */ MY_ATTRIBUTE((nonnull(1), warn_unused_result)); -#ifdef WITH_WSREP -//extern "C" int wsrep_trx_is_aborting(void *thd_ptr); -#endif - /** Parse hint for table and its indexes, and update the information in dictionary. @param[in] thd Connection thread |