Merge branch '2.0' into develop-2.0-merge

2016-11-15 00:09:24 +02:00
parent 2202ec7a33 7ddb4d8e5a
commit 3c15b58891
26 changed files with 621 additions and 239 deletions
--- a/include/maxscale/server.h
+++ b/include/maxscale/server.h
@ -115,6 +115,7 @@ typedef struct server
    long           persistpoolmax; /**< Maximum size of persistent connections pool */
    long           persistmaxtime; /**< Maximum number of seconds connection can live */
    int            persistmax;     /**< Maximum pool size actually achieved since startup */
+    uint8_t        charset;        /**< Default server character set */
    bool           is_active;      /**< Server is active and has not been "destroyed" */
 #if defined(SS_DEBUG)
    skygw_chk_t    server_chk_tail;