From 67f8520c385e854ebe74bb4e776fa57ecdb0d0b8 Mon Sep 17 00:00:00 2001 From: Markus Makela Date: Wed, 9 Sep 2015 13:00:10 +0300 Subject: [PATCH 1/4] Added missing include to sharding_common.h --- server/modules/include/sharding_common.h | 1 + 1 file changed, 1 insertion(+) diff --git a/server/modules/include/sharding_common.h b/server/modules/include/sharding_common.h index a401d2e31..dd30a74ea 100644 --- a/server/modules/include/sharding_common.h +++ b/server/modules/include/sharding_common.h @@ -1,6 +1,7 @@ #ifndef _SHARDING_COMMON_HG #define _SHARDING_COMMON_HG +#include #include #include #include From 1bf8853046a67d6150499eeb82885ddd15edb41c Mon Sep 17 00:00:00 2001 From: Markus Makela Date: Wed, 9 Sep 2015 13:21:54 +0300 Subject: [PATCH 2/4] Fix to MXS-339: https://mariadb.atlassian.net/browse/MXS-339 Renamed maxscale.cnf to maxscale.cnf.template --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a1f7e5e3..4627a3e43 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -193,7 +193,7 @@ install(FILES ${CMAKE_BINARY_DIR}/ReleaseNotes.txt DESTINATION ${MAXSCALE_SHARED install(FILES ${CMAKE_BINARY_DIR}/UpgradingToMaxScale120.txt DESTINATION ${MAXSCALE_SHAREDIR}) install(FILES server/maxscale_template.cnf DESTINATION ${MAXSCALE_SHAREDIR}) if(WITH_MAXSCALE_CNF) - install(FILES server/maxscale_template.cnf DESTINATION ${MAXSCALE_CONFDIR} RENAME maxscale.cnf) + install(FILES server/maxscale_template.cnf DESTINATION ${MAXSCALE_CONFDIR} RENAME maxscale.cnf.template) endif() install(FILES server/maxscale_binlogserver_template.cnf DESTINATION ${MAXSCALE_SHAREDIR}) install(FILES ${ERRMSG} DESTINATION ${MAXSCALE_VARDIR}/lib/maxscale From dd45a8f41856b902a4766fe45c34e9757ad665fb Mon Sep 17 00:00:00 2001 From: Markus Makela Date: Wed, 9 Sep 2015 16:23:07 +0300 Subject: [PATCH 3/4] Updated documentation. --- Documentation/Getting-Started/Configuration-Guide.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/Getting-Started/Configuration-Guide.md b/Documentation/Getting-Started/Configuration-Guide.md index 065f4ce0c..01a8c1dba 100644 --- a/Documentation/Getting-Started/Configuration-Guide.md +++ b/Documentation/Getting-Started/Configuration-Guide.md @@ -68,11 +68,11 @@ It should be noted that additional threads will be created to execute other inte #### `auth_connect_timeout` -The connection timeout in seconds for the MySQL connections to the backend server when user authentication data is fetched. Increasing the value of this parameter will cause MaxScale to wait longer for a response from the backend server before aborting the connection process when creating a new connection is made. +The connection timeout in seconds for the MySQL connections to the backend server when user authentication data is fetched. Increasing the value of this parameter will cause MaxScale to wait longer for a response from the backend server before aborting the authentication process. #### `auth_read_timeout` -The read timeout in seconds for the MySQL connection to the backend database when user authentication data is fetched. Increasing the value of this parameter will cause MaxScale to wait longer for a response from the backend server when user data is being actively fetched. If you have a large number of database users and grants and the authentication is failing, it is a good idea. Slower networks will also benefit from an increased timeout value. +The read timeout in seconds for the MySQL connection to the backend database when user authentication data is fetched. Increasing the value of this parameter will cause MaxScale to wait longer for a response from the backend server when user data is being actively fetched. If the authentication is failing and you either have a large number of database users and grants or the connection to the backend servers is slow, it is a good idea to increase this value. #### `auth_write_timeout` From 9f01d0ec3f5a535b353dccf81d42b1885ddf1abd Mon Sep 17 00:00:00 2001 From: counterpoint Date: Thu, 10 Sep 2015 10:54:33 +0100 Subject: [PATCH 4/4] Fix type. --- server/modules/protocol/mysql_backend.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/modules/protocol/mysql_backend.c b/server/modules/protocol/mysql_backend.c index 4ecf5ffa1..113e5dab0 100644 --- a/server/modules/protocol/mysql_backend.c +++ b/server/modules/protocol/mysql_backend.c @@ -32,7 +32,7 @@ * 17/06/2013 Massimiliano Pinto Added MaxScale To Backends routines * 01/07/2013 Massimiliano Pinto Put Log Manager example code behind SS_DEBUG macros. * 03/07/2013 Massimiliano Pinto Added delayq for incoming data before mysql connection - * 04/07/2013 Massimiliano Pinto Added asyncrhronous MySQL protocol connection to backend + * 04/07/2013 Massimiliano Pinto Added asynchronous MySQL protocol connection to backend * 05/07/2013 Massimiliano Pinto Added closeSession if backend auth fails * 12/07/2013 Massimiliano Pinto Added Mysql Change User via dcb->func.auth() * 15/07/2013 Massimiliano Pinto Added Mysql session change via dcb->func.session()