Skip to content

M
MariaDB
Commit eba0120d authored by Jan Lindström's avatar Jan Lindström
Browse files
Options

Fix test failures on embedded server. 

Problem was incorrect definition of wsrep_recovery,
trx_sys_update_wsrep_checkpoint and
trx_sys_read_wsrep_checkpoint functions causing
innodb_plugin not to load as there was undefined symbols.
parent f1af2114
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 31 deletions
sql/wsrep_sst.cc
View file @ eba0120d
...@@ -364,7 +364,8 @@ static int generate_binlog_opt_val(char** ret) ...@@ -364,7 +364,8 @@ static int generate_binlog_opt_val(char** ret)
if (opt_bin_log) if (opt_bin_log)
{ {
assert(opt_bin_logname); assert(opt_bin_logname);
*ret= my_strdup(opt_bin_logname, MYF(0)); *ret= strcmp(opt_bin_logname, "0") ?
my_strdup(opt_bin_logname, MYF(0)) : my_strdup("", MYF(0));
} }
else else
{ {
......
storage/innobase/buf/buf0dump.cc
View file @ eba0120d
...@@ -41,9 +41,7 @@ Created April 08, 2011 Vasil Dimov ...@@ -41,9 +41,7 @@ Created April 08, 2011 Vasil Dimov
#include "sync0rw.h" /* rw_lock_s_lock() */ #include "sync0rw.h" /* rw_lock_s_lock() */
#include "ut0byte.h" /* ut_ull_create() */ #include "ut0byte.h" /* ut_ull_create() */
#include "ut0sort.h" /* UT_SORT_FUNCTION_BODY */ #include "ut0sort.h" /* UT_SORT_FUNCTION_BODY */
#ifdef WITH_WSREP #include "wsrep_mysqld.h" /* wsrep_recovery */
extern my_bool wsrep_recovery;
#endif /* WITH_WSREP */
enum status_severity { enum status_severity {
STATUS_INFO, STATUS_INFO,
...@@ -692,12 +690,13 @@ DECLARE_THREAD(buf_dump_thread)( ...@@ -692,12 +690,13 @@ DECLARE_THREAD(buf_dump_thread)(
buf_load_status(STATUS_INFO, "not started"); buf_load_status(STATUS_INFO, "not started");
if (srv_buffer_pool_load_at_startup) { if (srv_buffer_pool_load_at_startup) {
#ifdef WITH_WSREP #ifdef WITH_WSREP
if (!wsrep_recovery) { if (!wsrep_recovery) {
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
buf_load(); buf_load();
#ifdef WITH_WSREP #ifdef WITH_WSREP
} }
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
} }
...@@ -725,6 +724,7 @@ DECLARE_THREAD(buf_dump_thread)( ...@@ -725,6 +724,7 @@ DECLARE_THREAD(buf_dump_thread)(
#ifdef WITH_WSREP #ifdef WITH_WSREP
if (!wsrep_recovery) { if (!wsrep_recovery) {
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
buf_dump(FALSE /* ignore shutdown down flag, buf_dump(FALSE /* ignore shutdown down flag,
keep going even if we are in a shutdown state */); keep going even if we are in a shutdown state */);
#ifdef WITH_WSREP #ifdef WITH_WSREP
......
storage/innobase/include/trx0sys.h
View file @ eba0120d
...@@ -315,6 +315,7 @@ trx_sys_print_mysql_binlog_offset(void); ...@@ -315,6 +315,7 @@ trx_sys_print_mysql_binlog_offset(void);
@param[in] xid Transaction XID @param[in] xid Transaction XID
@param[in,out] sys_header sys_header @param[in,out] sys_header sys_header
@param[in] mtr minitransaction */ @param[in] mtr minitransaction */
UNIV_INTERN
void void
trx_sys_update_wsrep_checkpoint( trx_sys_update_wsrep_checkpoint(
const XID* xid, const XID* xid,
...@@ -322,8 +323,10 @@ trx_sys_update_wsrep_checkpoint( ...@@ -322,8 +323,10 @@ trx_sys_update_wsrep_checkpoint(
mtr_t* mtr); mtr_t* mtr);
/** Read WSREP XID from sys_header of TRX_SYS_PAGE_NO = 5. /** Read WSREP XID from sys_header of TRX_SYS_PAGE_NO = 5.
@param[out] xid Transaction XID */ @param[out] xid Transaction XID
void @return true on success, false on error. */
UNIV_INTERN
bool
trx_sys_read_wsrep_checkpoint(XID* xid); trx_sys_read_wsrep_checkpoint(XID* xid);
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
......
storage/innobase/srv/srv0start.cc
View file @ eba0120d
...@@ -67,6 +67,8 @@ Created 2/16/1996 Heikki Tuuri ...@@ -67,6 +67,8 @@ Created 2/16/1996 Heikki Tuuri
#include "ibuf0ibuf.h" #include "ibuf0ibuf.h"
#include "srv0start.h" #include "srv0start.h"
#include "srv0srv.h" #include "srv0srv.h"
#include "wsrep_mysqld.h" /* wsrep_recovery */
#ifndef UNIV_HOTBACKUP #ifndef UNIV_HOTBACKUP
# include "trx0rseg.h" # include "trx0rseg.h"
# include "os0proc.h" # include "os0proc.h"
...@@ -178,10 +180,6 @@ UNIV_INTERN mysql_pfs_key_t srv_master_thread_key; ...@@ -178,10 +180,6 @@ UNIV_INTERN mysql_pfs_key_t srv_master_thread_key;
UNIV_INTERN mysql_pfs_key_t srv_purge_thread_key; UNIV_INTERN mysql_pfs_key_t srv_purge_thread_key;
#endif /* UNIV_PFS_THREAD */ #endif /* UNIV_PFS_THREAD */
#ifdef WITH_WSREP
extern my_bool wsrep_recovery;
#endif /* WITH_WSREP */
/*********************************************************************//** /*********************************************************************//**
Convert a numeric string that optionally ends in G or M or K, to a number Convert a numeric string that optionally ends in G or M or K, to a number
containing megabytes. containing megabytes.
...@@ -2904,6 +2902,7 @@ innobase_start_or_create_for_mysql() ...@@ -2904,6 +2902,7 @@ innobase_start_or_create_for_mysql()
--wsrep-recover */ --wsrep-recover */
if (!wsrep_recovery) { if (!wsrep_recovery) {
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
/* Create the buffer pool dump/load thread */ /* Create the buffer pool dump/load thread */
buf_dump_thread_handle = os_thread_create(buf_dump_thread, NULL, NULL); buf_dump_thread_handle = os_thread_create(buf_dump_thread, NULL, NULL);
buf_dump_thread_started = true; buf_dump_thread_started = true;
...@@ -2914,6 +2913,7 @@ innobase_start_or_create_for_mysql() ...@@ -2914,6 +2913,7 @@ innobase_start_or_create_for_mysql()
"recovery."); "recovery.");
} }
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
} }
srv_was_started = TRUE; srv_was_started = TRUE;
......
storage/innobase/trx/trx0sys.cc
View file @ eba0120d
...@@ -346,6 +346,7 @@ static inline void read_wsrep_xid_uuid(const XID* xid, unsigned char* buf) ...@@ -346,6 +346,7 @@ static inline void read_wsrep_xid_uuid(const XID* xid, unsigned char* buf)
@param[in] xid Transaction XID @param[in] xid Transaction XID
@param[in,out] sys_header sys_header @param[in,out] sys_header sys_header
@param[in] mtr minitransaction */ @param[in] mtr minitransaction */
UNIV_INTERN
void void
trx_sys_update_wsrep_checkpoint( trx_sys_update_wsrep_checkpoint(
const XID* xid, const XID* xid,
...@@ -404,8 +405,10 @@ trx_sys_update_wsrep_checkpoint( ...@@ -404,8 +405,10 @@ trx_sys_update_wsrep_checkpoint(
} }
/** Read WSREP XID from sys_header of TRX_SYS_PAGE_NO = 5. /** Read WSREP XID from sys_header of TRX_SYS_PAGE_NO = 5.
@param[out] xid Transaction XID */ @param[out] xid Transaction XID
void @return true on success, false on error. */
UNIV_INTERN
bool
trx_sys_read_wsrep_checkpoint(XID* xid) trx_sys_read_wsrep_checkpoint(XID* xid)
{ {
trx_sysf_t* sys_header; trx_sysf_t* sys_header;
...@@ -425,8 +428,8 @@ trx_sys_read_wsrep_checkpoint(XID* xid) ...@@ -425,8 +428,8 @@ trx_sys_read_wsrep_checkpoint(XID* xid)
xid->formatID = -1; xid->formatID = -1;
trx_sys_update_wsrep_checkpoint(xid, sys_header, &mtr); trx_sys_update_wsrep_checkpoint(xid, sys_header, &mtr);
mtr_commit(&mtr); mtr_commit(&mtr);
return; return false;
} }
xid->formatID = (int)mach_read_from_4( xid->formatID = (int)mach_read_from_4(
sys_header sys_header
...@@ -442,6 +445,7 @@ trx_sys_read_wsrep_checkpoint(XID* xid) ...@@ -442,6 +445,7 @@ trx_sys_read_wsrep_checkpoint(XID* xid)
XIDDATASIZE); XIDDATASIZE);
mtr_commit(&mtr); mtr_commit(&mtr);
return true;
} }
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
......
storage/xtradb/buf/buf0dump.cc
View file @ eba0120d
...@@ -41,9 +41,7 @@ Created April 08, 2011 Vasil Dimov ...@@ -41,9 +41,7 @@ Created April 08, 2011 Vasil Dimov
#include "sync0rw.h" /* rw_lock_s_lock() */ #include "sync0rw.h" /* rw_lock_s_lock() */
#include "ut0byte.h" /* ut_ull_create() */ #include "ut0byte.h" /* ut_ull_create() */
#include "ut0sort.h" /* UT_SORT_FUNCTION_BODY */ #include "ut0sort.h" /* UT_SORT_FUNCTION_BODY */
#ifdef WITH_WSREP #include "wsrep_mysqld.h" /* wsrep_recovery */
extern my_bool wsrep_recovery;
#endif /* WITH_WSREP */
enum status_severity { enum status_severity {
STATUS_INFO, STATUS_INFO,
......
storage/xtradb/include/trx0sys.h
View file @ eba0120d
...@@ -336,17 +336,19 @@ trx_sys_print_mysql_binlog_offset(void); ...@@ -336,17 +336,19 @@ trx_sys_print_mysql_binlog_offset(void);
@param[in] xid Transaction XID @param[in] xid Transaction XID
@param[in,out] sys_header sys_header @param[in,out] sys_header sys_header
@param[in] mtr minitransaction */ @param[in] mtr minitransaction */
UNIV_INTERN
void void
trx_sys_update_wsrep_checkpoint( trx_sys_update_wsrep_checkpoint(
const XID* xid, const XID* xid,
trx_sysf_t* sys_header, trx_sysf_t* sys_header,
mtr_t* mtr); mtr_t* mtr);
/** Read WSREP XID from sys_header of TRX_SYS_PAGE_NO = 5. /** Read WSREP checkpoint XID from sys header.
@param[out] xid Transaction XID */ @param[out] xid Transaction XID
void @return true on success, false on error. */
UNIV_INTERN
bool
trx_sys_read_wsrep_checkpoint(XID* xid); trx_sys_read_wsrep_checkpoint(XID* xid);
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
/*****************************************************************//** /*****************************************************************//**
......
storage/xtradb/srv/srv0start.cc
View file @ eba0120d
...@@ -68,6 +68,8 @@ Created 2/16/1996 Heikki Tuuri ...@@ -68,6 +68,8 @@ Created 2/16/1996 Heikki Tuuri
#include "ibuf0ibuf.h" #include "ibuf0ibuf.h"
#include "srv0start.h" #include "srv0start.h"
#include "srv0srv.h" #include "srv0srv.h"
#include "wsrep_mysqld.h" /* wsrep_recovery */
#ifndef UNIV_HOTBACKUP #ifndef UNIV_HOTBACKUP
# include "trx0rseg.h" # include "trx0rseg.h"
# include "os0proc.h" # include "os0proc.h"
...@@ -196,10 +198,6 @@ UNIV_INTERN mysql_pfs_key_t srv_purge_thread_key; ...@@ -196,10 +198,6 @@ UNIV_INTERN mysql_pfs_key_t srv_purge_thread_key;
UNIV_INTERN mysql_pfs_key_t srv_log_tracking_thread_key; UNIV_INTERN mysql_pfs_key_t srv_log_tracking_thread_key;
#endif /* UNIV_PFS_THREAD */ #endif /* UNIV_PFS_THREAD */
#ifdef WITH_WSREP
extern my_bool wsrep_recovery;
#endif /* WITH_WSREP */
/*********************************************************************//** /*********************************************************************//**
Convert a numeric string that optionally ends in G or M or K, to a number Convert a numeric string that optionally ends in G or M or K, to a number
containing megabytes. containing megabytes.
......
storage/xtradb/trx/trx0sys.cc
View file @ eba0120d
...@@ -346,6 +346,7 @@ static inline void read_wsrep_xid_uuid(const XID* xid, unsigned char* buf) ...@@ -346,6 +346,7 @@ static inline void read_wsrep_xid_uuid(const XID* xid, unsigned char* buf)
@param[in] xid Transaction XID @param[in] xid Transaction XID
@param[in,out] sys_header sys_header @param[in,out] sys_header sys_header
@param[in] mtr minitransaction */ @param[in] mtr minitransaction */
UNIV_INTERN
void void
trx_sys_update_wsrep_checkpoint( trx_sys_update_wsrep_checkpoint(
const XID* xid, const XID* xid,
...@@ -404,8 +405,10 @@ trx_sys_update_wsrep_checkpoint( ...@@ -404,8 +405,10 @@ trx_sys_update_wsrep_checkpoint(
} }
/** Read WSREP XID from sys_header of TRX_SYS_PAGE_NO = 5. /** Read WSREP XID from sys_header of TRX_SYS_PAGE_NO = 5.
@param[out] xid Transaction XID */ @param[out] xid Transaction XID
void @retval true if found, false if not */
UNIV_INTERN
bool
trx_sys_read_wsrep_checkpoint(XID* xid) trx_sys_read_wsrep_checkpoint(XID* xid)
{ {
trx_sysf_t* sys_header; trx_sysf_t* sys_header;
...@@ -425,8 +428,8 @@ trx_sys_read_wsrep_checkpoint(XID* xid) ...@@ -425,8 +428,8 @@ trx_sys_read_wsrep_checkpoint(XID* xid)
xid->formatID = -1; xid->formatID = -1;
trx_sys_update_wsrep_checkpoint(xid, sys_header, &mtr); trx_sys_update_wsrep_checkpoint(xid, sys_header, &mtr);
mtr_commit(&mtr); mtr_commit(&mtr);
return; return false;
} }
xid->formatID = (int)mach_read_from_4( xid->formatID = (int)mach_read_from_4(
sys_header sys_header
...@@ -442,6 +445,7 @@ trx_sys_read_wsrep_checkpoint(XID* xid) ...@@ -442,6 +445,7 @@ trx_sys_read_wsrep_checkpoint(XID* xid)
XIDDATASIZE); XIDDATASIZE);
mtr_commit(&mtr); mtr_commit(&mtr);
return true;
} }
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7