hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2011 Do not "free" CONFIG_MASTER_OPTIONS

Browse Source 
Its members are std::string, so they do not need to be
explicitly freed.
This commit is contained in:
Johan Wikman
2018-08-23 13:39:02 +03:00
parent e85c4387c7
commit 0c59516e24
1 changed files with 0 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
server/modules/routing/binlogrouter/blr_slave.cc
View File

@ -192,7 +192,6 @@ static int blr_parse_change_master_command(char *input,
static int blr_handle_change_master_token(char *input, static int blr_handle_change_master_token(char *input,
char *error, char *error,
CHANGE_MASTER_OPTIONS *config); CHANGE_MASTER_OPTIONS *config);
static void blr_master_free_parsed_options(CHANGE_MASTER_OPTIONS *options);
static int blr_slave_send_var_value(ROUTER_INSTANCE *router, static int blr_slave_send_var_value(ROUTER_INSTANCE *router,
ROUTER_SLAVE *slave, ROUTER_SLAVE *slave,
const char *variable, const char *variable,
@ -328,7 +327,6 @@ static bool blr_check_connecting_slave(const ROUTER_INSTANCE *router,
enum blr_slave_check check); enum blr_slave_check check);
static void blr_abort_change_master(ROUTER_INSTANCE *router, static void blr_abort_change_master(ROUTER_INSTANCE *router,
MASTER_SERVER_CFG *current_master, MASTER_SERVER_CFG *current_master,
CHANGE_MASTER_OPTIONS *change_master,
const char *error); const char *error);
static void blr_slave_abort_dump_request(ROUTER_SLAVE *slave, static void blr_slave_abort_dump_request(ROUTER_SLAVE *slave,
const char *errmsg); const char *errmsg);
@ -4186,8 +4184,6 @@ int blr_handle_change_master(ROUTER_INSTANCE* router,
router->service->name, router->service->name,
error); error);
blr_master_free_parsed_options(&change_master);
return -1; return -1;
} }
@ -4201,8 +4197,6 @@ int blr_handle_change_master(ROUTER_INSTANCE* router,
strcpy(error, MESSAGE); strcpy(error, MESSAGE);
MXS_ERROR("%s: %s", router->service->name, error); MXS_ERROR("%s: %s", router->service->name, error);
blr_master_free_parsed_options(&change_master);
return -1; return -1;
} }
@ -4223,7 +4217,6 @@ int blr_handle_change_master(ROUTER_INSTANCE* router,
blr_abort_change_master(router, blr_abort_change_master(router,
current_master, current_master,
&change_master,
error); error);
spinlock_release(&router->lock); spinlock_release(&router->lock);
@ -4252,7 +4245,6 @@ int blr_handle_change_master(ROUTER_INSTANCE* router,
blr_abort_change_master(router, blr_abort_change_master(router,
current_master, current_master,
&change_master,
error); error);
spinlock_release(&router->lock); spinlock_release(&router->lock);
@ -4284,7 +4276,6 @@ int blr_handle_change_master(ROUTER_INSTANCE* router,
blr_abort_change_master(router, blr_abort_change_master(router,
current_master, current_master,
&change_master,
error); error);
spinlock_release(&router->lock); spinlock_release(&router->lock);
@ -4331,7 +4322,6 @@ int blr_handle_change_master(ROUTER_INSTANCE* router,
{ {
blr_abort_change_master(router, blr_abort_change_master(router,
current_master, current_master,
&change_master,
error); error);
spinlock_release(&router->lock); spinlock_release(&router->lock);
@ -4360,7 +4350,6 @@ int blr_handle_change_master(ROUTER_INSTANCE* router,
{ {
blr_abort_change_master(router, blr_abort_change_master(router,
current_master, current_master,
&change_master,
error); error);
MXS_FREE(master_logfile); MXS_FREE(master_logfile);
@ -4375,8 +4364,6 @@ int blr_handle_change_master(ROUTER_INSTANCE* router,
/* Free data struct */ /* Free data struct */
blr_master_free_config(current_master); blr_master_free_config(current_master);
blr_master_free_parsed_options(&change_master);
MXS_FREE(master_logfile); MXS_FREE(master_logfile);
if (router->master_state == BLRM_UNCONFIGURED) if (router->master_state == BLRM_UNCONFIGURED)
@ -5174,30 +5161,6 @@ static std::string *blr_validate_change_master_option(const char *option, CHANGE
} }
} }
/**
* Free parsed master options struct pointers
*
* @param options Parsed option struct
*/
static void
blr_master_free_parsed_options(CHANGE_MASTER_OPTIONS *options)
{
options->host.clear();
options->port.clear();
options->user.clear();
options->password.clear();
options->binlog_file.clear();
options->binlog_pos.clear();
options->ssl_enabled.clear();
options->ssl_key.clear();
options->ssl_ca.clear();
options->ssl_cert.clear();
options->ssl_version.clear();
options->use_mariadb10_gtid.clear();
options->heartbeat_period.clear();
options->connect_retry.clear();
}
/** /**
* Send a MySQL protocol response for selected variable * Send a MySQL protocol response for selected variable
* *
@ -9178,14 +9141,11 @@ static bool blr_check_connecting_slave(const ROUTER_INSTANCE *router,
*/ */
static void blr_abort_change_master(ROUTER_INSTANCE *router, static void blr_abort_change_master(ROUTER_INSTANCE *router,
MASTER_SERVER_CFG *current_master, MASTER_SERVER_CFG *current_master,
CHANGE_MASTER_OPTIONS *change_master,
const char *error) const char *error)
{ {
MXS_ERROR("%s: %s", router->service->name, error); MXS_ERROR("%s: %s", router->service->name, error);
/* restore previous master_host and master_port */ /* restore previous master_host and master_port */
blr_master_restore_config(router, current_master); blr_master_restore_config(router, current_master);
/* Free parsed options */
blr_master_free_parsed_options(change_master);
} }
/** /**