From a983df5a7e1ae5c4bacca7708cb2cfe0d6599a9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Fri, 15 Jun 2018 11:45:40 +0300 Subject: [PATCH 1/2] Fix testlogthrottling compilation failure The ifstream constructor for some reason doesn't understand strings. --- server/core/test/testlogthrottling.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/core/test/testlogthrottling.cc b/server/core/test/testlogthrottling.cc index 12db4cfbb..b8b2c77da 100644 --- a/server/core/test/testlogthrottling.cc +++ b/server/core/test/testlogthrottling.cc @@ -110,7 +110,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_flush_sync(); - ifstream in(logfile); + ifstream in(logfile.c_str()); in.seekg(0, ios_base::end); THREAD_ARG args[N_THREADS]; @@ -171,7 +171,7 @@ int main(int argc, char* argv[]) char tmpbuf[] = "/tmp/maxscale_test_logthrottling_XXXXXX"; char* logdir = mkdtemp(tmpbuf); ensure(logdir); - logfile.assign(string{logdir} + '/' + LOGNAME); + logfile.assign(string(logdir) + '/' + LOGNAME); if (mxs_log_init(NULL, logdir, MXS_LOG_TARGET_FS)) { From d923042115e493eb6cc820dab66718c015dd7c53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Mon, 18 Jun 2018 10:53:11 +0300 Subject: [PATCH 2/2] MXS-1930: Fix server version checks The server versions now checks for 10.3 when deciding whether to send new capabilities. --- server/modules/protocol/MySQL/MySQLClient/mysql_client.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/modules/protocol/MySQL/MySQLClient/mysql_client.c b/server/modules/protocol/MySQL/MySQLClient/mysql_client.c index 10fb7e88a..22d0ebfe7 100644 --- a/server/modules/protocol/MySQL/MySQLClient/mysql_client.c +++ b/server/modules/protocol/MySQL/MySQLClient/mysql_client.c @@ -238,7 +238,8 @@ int MySQLSendHandshake(DCB* dcb) mysql_server_language = dcb->service->dbref->server->charset; if (dcb->service->dbref->server->server_string && - strstr(dcb->service->dbref->server->server_string, "10.2.")) + (strstr(dcb->service->dbref->server->server_string, "10.2.") || + strstr(dcb->service->dbref->server->server_string, "10.3."))) { /** The backend servers support the extended capabilities */ is_maria = true;