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

Merge branch '2.1' into 2.2

Browse Source
This commit is contained in:
Markus Mäkelä
2018-06-18 11:32:13 +03:00
parent 09df017528 d923042115
commit ca155fbfe9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/test/test_logthrottling.cc
View File

@ -111,7 +111,7 @@ bool run(const MXS_LOG_THROTTLING& throttling, int priority, size_t n_generate,
mxs_log_set_throttling(&throttling); // Causes message to be logged. mxs_log_set_throttling(&throttling); // Causes message to be logged.
mxs_log_flush_sync(); mxs_log_flush_sync();
ifstream in(logfile); ifstream in(logfile.c_str());
in.seekg(0, ios_base::end); in.seekg(0, ios_base::end);
THREAD_ARG args[N_THREADS]; THREAD_ARG args[N_THREADS];
@ -172,7 +172,7 @@ int main(int argc, char* argv[])
char tmpbuf[] = "/tmp/maxscale_test_logthrottling_XXXXXX"; char tmpbuf[] = "/tmp/maxscale_test_logthrottling_XXXXXX";
char* logdir = mkdtemp(tmpbuf); char* logdir = mkdtemp(tmpbuf);
ensure(logdir); ensure(logdir);
logfile.assign(string{logdir} + '/' + LOGNAME); logfile.assign(string(logdir) + '/' + LOGNAME);
if (mxs_log_init(NULL, logdir, MXS_LOG_TARGET_FS)) if (mxs_log_init(NULL, logdir, MXS_LOG_TARGET_FS))
{ {

2
server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
View File

@ -229,7 +229,7 @@ int MySQLSendHandshake(DCB* dcb)
{ {
mysql_server_language = dcb->service->dbref->server->charset; mysql_server_language = dcb->service->dbref->server->charset;
if (strstr(dcb->service->dbref->server->version_string, "10.2.")) if (dcb->service->dbref->server->version >= 100200)
{ {
/** The backend servers support the extended capabilities */ /** The backend servers support the extended capabilities */
is_maria = true; is_maria = true;