1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-33157 WSREP: Fix function pointer mismatch

Browse Source 
wsrep_plugin_init(), wsrep_plugin_deinit(): Remove these dummy functions
in order to fix an error that would be flagged by cmake -DWITH_UBSAN=ON
when using clang.

wsrep_show_ready(), wsrep_show_bf_aborts(): Correct the signature.
This commit is contained in:
Marko Mäkelä 2024-01-03 08:52:50 +02:00
parent 832e96deb6
commit 96130b1898
5 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sql/wsrep_mysqld.cc
View File

@ -512,7 +512,8 @@ my_bool wsrep_ready_get (void)
return ret; return ret;
} }
int wsrep_show_ready(THD *thd, SHOW_VAR *var, char *buff) int wsrep_show_ready(THD *thd, SHOW_VAR *var, void *buff,
system_status_var *, enum_var_type)
{ {
var->type= SHOW_MY_BOOL; var->type= SHOW_MY_BOOL;
var->value= buff; var->value= buff;

3
sql/wsrep_mysqld.h
View File

@ -148,7 +148,8 @@ extern char* wsrep_cluster_capabilities;
int wsrep_show_status(THD *thd, SHOW_VAR *var, void *buff, int wsrep_show_status(THD *thd, SHOW_VAR *var, void *buff,
system_status_var *status_var, enum_var_type scope); system_status_var *status_var, enum_var_type scope);
int wsrep_show_ready(THD *thd, SHOW_VAR *var, char *buff); int wsrep_show_ready(THD *thd, SHOW_VAR *var, void *buff,
system_status_var *, enum_var_type);
void wsrep_free_status(THD *thd); void wsrep_free_status(THD *thd);
void wsrep_update_cluster_state_uuid(const char* str); void wsrep_update_cluster_state_uuid(const char* str);

16
sql/wsrep_plugin.cc
View File

@ -18,18 +18,6 @@
#include <mysql/plugin.h> #include <mysql/plugin.h>
static int wsrep_plugin_init(void *p)
{
WSREP_DEBUG("wsrep_plugin_init()");
return 0;
}
static int wsrep_plugin_deinit(void *p)
{
WSREP_DEBUG("wsrep_plugin_deinit()");
return 0;
}
struct Mysql_replication wsrep_plugin= { struct Mysql_replication wsrep_plugin= {
MYSQL_REPLICATION_INTERFACE_VERSION MYSQL_REPLICATION_INTERFACE_VERSION
}; };
@ -42,8 +30,8 @@ maria_declare_plugin(wsrep)
"Codership Oy", "Codership Oy",
"Wsrep replication plugin", "Wsrep replication plugin",
PLUGIN_LICENSE_GPL, PLUGIN_LICENSE_GPL,
wsrep_plugin_init, NULL,
wsrep_plugin_deinit, NULL,
0x0100, 0x0100,
NULL, /* Status variables */ NULL, /* Status variables */
NULL, /* System variables */ NULL, /* System variables */

2
sql/wsrep_thd.cc
View File

@ -36,7 +36,7 @@ static Wsrep_thd_queue* wsrep_rollback_queue= 0;
static Atomic_counter<uint64_t> wsrep_bf_aborts_counter; static Atomic_counter<uint64_t> wsrep_bf_aborts_counter;
int wsrep_show_bf_aborts (THD *thd, SHOW_VAR *var, char *buff, int wsrep_show_bf_aborts (THD *thd, SHOW_VAR *var, void *, system_status_var *,
enum enum_var_type scope) enum enum_var_type scope)
{ {
wsrep_local_bf_aborts= wsrep_bf_aborts_counter; wsrep_local_bf_aborts= wsrep_bf_aborts_counter;

2
sql/wsrep_thd.h
View File

@ -82,7 +82,7 @@ private:
mysql_cond_t COND_wsrep_thd_queue; mysql_cond_t COND_wsrep_thd_queue;
}; };
int wsrep_show_bf_aborts (THD *thd, SHOW_VAR *var, char *buff, int wsrep_show_bf_aborts (THD *thd, SHOW_VAR *var, void *, system_status_var *,
enum enum_var_type scope); enum enum_var_type scope);
bool wsrep_create_appliers(long threads, bool mutex_protected=false); bool wsrep_create_appliers(long threads, bool mutex_protected=false);
void wsrep_create_rollbacker(); void wsrep_create_rollbacker();