Skip to content

Commit 731e668

Browse files
author
Daniele Sciascia
committed
Update wsrep-lib
1 parent afc8b4c commit 731e668

File tree

6 files changed

+9
-5
lines changed

6 files changed

+9
-5
lines changed

sql/wsrep_client_service.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,3 +393,5 @@ int Wsrep_client_service::bf_rollback()
393393

394394
DBUG_RETURN(ret);
395395
}
396+
397+
void Wsrep_client_service::notify_state_change() {}

sql/wsrep_client_service.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ class Wsrep_client_service : public wsrep::client_service
6868
void debug_sync(const char*) override;
6969
void debug_crash(const char*) override;
7070
int bf_rollback() override;
71+
void notify_state_change() override;
72+
7173
private:
7274
friend class Wsrep_server_service;
7375
THD* m_thd;

sql/wsrep_mysqld.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -899,7 +899,7 @@ int wsrep_init()
899899
Wsrep_server_state::init_provider_services();
900900
if (Wsrep_server_state::instance().load_provider(
901901
wsrep_provider,
902-
[&](wsrep::provider_options &opts) {
902+
[&](const wsrep::provider_options &opts) {
903903
std::string defaults(wsrep_provider_options);
904904
if (wsrep_load_provider_plugin_defaults(opts, defaults))
905905
{

sql/wsrep_plugin.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ static void make_my_options(std::vector<struct my_option_arg> &my_args,
325325
my_options.push_back(null_opt);
326326
}
327327

328-
static void make_my_option_args(wsrep::provider_options &options,
328+
static void make_my_option_args(const wsrep::provider_options &options,
329329
std::string &defaults,
330330
std::vector<struct my_option_arg> &my_args)
331331
{
@@ -346,7 +346,7 @@ static my_bool option_changed(const struct my_option *opt, const char *value,
346346
return 0;
347347
}
348348

349-
int wsrep_load_provider_plugin_defaults(wsrep::provider_options &options,
349+
int wsrep_load_provider_plugin_defaults(const wsrep::provider_options &options,
350350
std::string &extra_options)
351351
{
352352
int argc= orig_argc;

sql/wsrep_plugin.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ void wsrep_destroy_sysvar(struct st_mysql_sys_var *);
3636

3737
/* Parse defaults from config/command line, returns corresponding
3838
provider options string */
39-
int wsrep_load_provider_plugin_defaults(wsrep::provider_options &,
39+
int wsrep_load_provider_plugin_defaults(const wsrep::provider_options &,
4040
std::string &);
4141

4242
#endif /* WSREP_PLUGIN_H */

wsrep-lib

0 commit comments

Comments
 (0)