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

MXS-2011 Use std::string in MASTER_SERVER_CFG

Browse Source 
Makes things simpler if you do not need to worry about string
lifetime management.
This commit is contained in:
Johan Wikman
2018-08-23 14:11:50 +03:00
parent 0c59516e24
commit 1d059f26eb
2 changed files with 58 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/modules/routing/binlogrouter/blr.h
View File

@ -344,20 +344,20 @@ typedef struct mariadb_gtid_info
/* Master Server configuration struct */
typedef struct master_server_config
{
char *host;
std::string host;
unsigned short port;
char logfile[BINLOG_FNAMELEN + 1];
std::string logfile;
uint64_t pos;
uint64_t safe_pos;
char *user;
char *password;
char *filestem;
std::string user;
std::string password;
std::string filestem;
/* SSL options */
char *ssl_key;
char *ssl_cert;
char *ssl_ca;
std::string ssl_key;
std::string ssl_cert;
std::string ssl_ca;
int ssl_enabled;
char *ssl_version;
std::string ssl_version;
/* Connect options */
int heartbeat;
} MASTER_SERVER_CFG;