Merge branch 'develop' into 1.2.1-binlog_router_trx

server/include/dbusers.h

@@ -42,6 +42,11 @@
 #define USERS_REFRESH_TIME 30           /* Allowed time interval (in seconds) after last update*/
 #define USERS_REFRESH_MAX_PER_TIME 4    /* Max number of load calls within the time interval */
 
+/** Default timeout values used by the connections which fetch user authentication data */
+#define DEFAULT_AUTH_CONNECT_TIMEOUT 3
+#define DEFAULT_AUTH_READ_TIMEOUT 1
+#define DEFAULT_AUTH_WRITE_TIMEOUT 2
+
 /* Max length of fields in the mysql.user table */
 #define MYSQL_USER_MAXLEN	128
 #define MYSQL_PASSWORD_LEN	41

server/include/maxconfig.h

@@ -106,6 +106,9 @@ typedef struct {
 	unsigned int		pollsleep;		/**< Wait time in blocking polls */
         int syslog; /*< Log to syslog */
         int maxlog; /*< Log to MaxScale's own logs */
+        unsigned int auth_conn_timeout; /*< Connection timeout for the user authentication */
+        unsigned int auth_read_timeout; /*< Read timeout for the user authentication */
+        unsigned int auth_write_timeout; /*<  Write timeout for the user authentication */
 } GATEWAY_CONF;
 
 extern int		config_load(char *);