mirror of
https://github.com/MariaDB/server.git
synced 2026-04-22 08:15:31 +02:00
MDEV-6247: Merge 10.0-galera to 10.1.
Merged lp:maria/maria-10.0-galera up to revision 3879. Added a new functions to handler API to forcefully abort_transaction, producing fake_trx_id, get_checkpoint and set_checkpoint for XA. These were added for future possiblity to add more storage engines that could use galera replication.
This commit is contained in:
parent
e974b56438
commit
df4dd593f2
327 changed files with 28128 additions and 333 deletions
|
|
@ -13,6 +13,25 @@
|
|||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
|
||||
IF(WITH_WSREP AND NOT EMBEDDED_LIBRARY)
|
||||
BUILD_WITH_WSREP()
|
||||
SET(WSREP_INCLUDES ${CMAKE_SOURCE_DIR}/wsrep)
|
||||
SET(WSREP_SOURCES
|
||||
wsrep_check_opts.cc
|
||||
wsrep_hton.cc
|
||||
wsrep_mysqld.cc
|
||||
wsrep_notify.cc
|
||||
wsrep_sst.cc
|
||||
wsrep_utils.cc
|
||||
wsrep_var.cc
|
||||
wsrep_binlog.cc
|
||||
wsrep_applier.cc
|
||||
wsrep_thd.cc
|
||||
)
|
||||
SET(WSREP_LIB wsrep)
|
||||
ENDIF()
|
||||
|
||||
INCLUDE_DIRECTORIES(
|
||||
${CMAKE_SOURCE_DIR}/include
|
||||
${CMAKE_SOURCE_DIR}/sql
|
||||
|
|
@ -20,6 +39,7 @@ ${PCRE_INCLUDES}
|
|||
${ZLIB_INCLUDE_DIR}
|
||||
${SSL_INCLUDE_DIRS}
|
||||
${CMAKE_BINARY_DIR}/sql
|
||||
${WSREP_INCLUDES}
|
||||
)
|
||||
|
||||
SET(GEN_SOURCES
|
||||
|
|
@ -91,6 +111,7 @@ SET (SQL_SOURCE
|
|||
../sql-common/mysql_async.c
|
||||
my_apc.cc my_apc.h
|
||||
rpl_gtid.cc rpl_parallel.cc
|
||||
${WSREP_SOURCES}
|
||||
table_cache.cc
|
||||
${CMAKE_CURRENT_BINARY_DIR}/sql_builtin.cc
|
||||
${GEN_SOURCES}
|
||||
|
|
@ -112,6 +133,7 @@ DTRACE_INSTRUMENT(sql)
|
|||
TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATIC_PLUGIN_LIBS}
|
||||
mysys mysys_ssl dbug strings vio pcre ${LIBJEMALLOC}
|
||||
${LIBWRAP} ${LIBCRYPT} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT}
|
||||
${WSREP_LIB}
|
||||
${SSL_LIBRARIES})
|
||||
|
||||
IF(WIN32)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue