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

Fix formatting of new(std::nothrow)

Browse Source 
The code previously formatted everything as `new( std::nothrow)`.
This commit is contained in:
Markus Mäkelä
2018-10-04 21:40:34 +03:00
parent 1af43d4ff5
commit 75ea1b6ea1
47 changed files with 109 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/monitor/mariadbmon/cluster_manipulation.cc
View File

@ -849,8 +849,8 @@ bool MariaDBMonitor::failover_perform(ClusterOperation& op)
* once so that latest status is printed. */
wait_cluster_stabilization(op, redirected_slaves);
MXS_INFO("Failover: slave replication confirmation took %.1f seconds with "
"%.1f seconds to spare.",
timer.lap().secs(), op.time_remaining.secs());
"%.1f seconds to spare.",
timer.lap().secs(), op.time_remaining.secs());
}
}
return rval;

14
server/modules/monitor/mariadbmon/mariadbmon.hh
View File

@ -265,17 +265,17 @@ private:
const MariaDBServer* demotion_target,
uint32_t gtid_domain,
std::string* reason_out = NULL);
int redirect_slaves(MariaDBServer* new_master,
const ServerArray& slaves,
ServerArray* redirected_slaves);
int redirect_slaves(MariaDBServer* new_master,
const ServerArray& slaves,
ServerArray* redirected_slaves);
int redirect_slaves_ex(ClusterOperation& op, const ServerArray& slaves,
ServerArray* redirected_slaves);
std::string generate_change_master_cmd(const std::string& master_host, int master_port);
bool start_external_replication(MariaDBServer* new_master, json_t** err_out);
void wait_cluster_stabilization(ClusterOperation& op, const ServerArray& slaves);
void report_and_disable(const std::string& operation,
const std::string& setting_name,
bool* setting_var);
void wait_cluster_stabilization(ClusterOperation& op, const ServerArray& slaves);
void report_and_disable(const std::string& operation,
const std::string& setting_name,
bool* setting_var);
bool check_gtid_replication(Log log_mode,
const MariaDBServer* demotion_target,
json_t** error_out);

3
server/modules/monitor/mariadbmon/mariadbmon_common.cc
View File

@ -50,4 +50,5 @@ ClusterOperation::ClusterOperation(OperationType type,
, replication_password(replication_password)
, error_out(error)
, time_remaining(time_remaining)
{}
{
}