Merge branch 'develop' into binlog_server_mariadb_master_encryption

server/modules/authenticator/cdc_plain_auth.c

@@ -26,11 +26,12 @@
  */
 
 #include <maxscale/gw_authenticator.h>
+#include <sys/stat.h>
 #include <cdc.h>
+#include <maxscale/alloc.h>
+#include <maxscale/gwdirs.h>
 #include <maxscale/modutil.h>
 #include <maxscale/users.h>
-#include <sys/stat.h>
-#include <maxscale/alloc.h>
 
 /* Allowed time interval (in seconds) after last update*/
 #define CDC_USERS_REFRESH_TIME 30

server/modules/authenticator/mysql_auth.c

@@ -32,7 +32,6 @@
 #include <maxscale/poll.h>
 #include <maxscale/dbusers.h>
 #include <maxscale/gwdirs.h>
-#include <maxscale/gw.h>
 #include <maxscale/secrets.h>
 #include <maxscale/utils.h>
 

server/modules/include/cdc.h

@@ -37,7 +37,6 @@
 #include <maxscale/router.h>
 #include <maxscale/poll.h>
 #include <maxscale/atomic.h>
-#include <maxscale/gw.h>
 
 MXS_BEGIN_DECLS
 

server/modules/protocol/CDC/cdc.c

@@ -32,7 +32,6 @@
 
 #include <cdc.h>
 #include <maxscale/alloc.h>
-#include <maxscale/gw.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/gw_protocol.h>

server/modules/protocol/HTTPD/httpd.c

@@ -33,9 +33,9 @@
  */
 
 #include "httpd.h"
+#include <ctype.h>
 #include <maxscale/alloc.h>
 #include <maxscale/gw_protocol.h>
-#include <maxscale/gw.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/resultset.h>

server/modules/protocol/HTTPD/httpd.h

@@ -37,7 +37,6 @@
 #include <maxscale/router.h>
 #include <maxscale/poll.h>
 #include <maxscale/atomic.h>
-#include <maxscale/gw.h>
 
 MXS_BEGIN_DECLS
 

server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c

@@ -16,7 +16,6 @@
 #include <maxscale/modutil.h>
 #include <maxscale/utils.h>
 #include <netinet/tcp.h>
-#include <maxscale/gw.h>
 #include <mysqld_error.h>
 
 /*

server/modules/protocol/MySQL/MySQLClient/mysql_client.c

@@ -52,7 +52,6 @@
 #include <mysql_auth.h>
 #include <maxscale/gw_ssl.h>
 #include <maxscale/poll.h>
-#include <maxscale/gw.h>
 #include <maxscale/modinfo.h>
 #include <sys/stat.h>
 #include <maxscale/modutil.h>

server/modules/protocol/MySQL/mysql_common.c

@@ -42,7 +42,6 @@
  *
  */
 
-#include <maxscale/gw.h>
 #include <maxscale/utils.h>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/alloc.h>

server/modules/protocol/maxscaled/maxscaled.c

@@ -21,14 +21,15 @@
 #include <maxscale/session.h>
 #include <sys/ioctl.h>
 #include <errno.h>
+#include <pwd.h>
 #include <sys/socket.h>
+#include <sys/types.h>
 #include <sys/un.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <maxscale/router.h>
 #include <maxscale/poll.h>
 #include <maxscale/atomic.h>
-#include <maxscale/gw.h>
 #include <maxscale/adminusers.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/modinfo.h>

server/modules/protocol/telnetd/telnetd.c

@@ -28,7 +28,6 @@
 #include <maxscale/router.h>
 #include <maxscale/poll.h>
 #include <maxscale/atomic.h>
-#include <maxscale/gw.h>
 #include <telnetd.h>
 #include <maxscale/adminusers.h>
 #include <maxscale/log_manager.h>

server/modules/routing/avro/avrorouter.h

@@ -22,7 +22,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <blr_constants.h>
-#include <maxscale/gw.h>
 #include <maxscale/dcb.h>
 #include <maxscale/service.h>
 #include <maxscale/spinlock.h>
@@ -108,7 +107,7 @@ typedef enum avro_binlog_end
 #define TABLE_MAP_MAX_NAME_LEN 64
 
 /** How many bytes each thread tries to send */
-#define AVRO_DATA_BURST_SIZE MAX_BUFFER_SIZE
+#define AVRO_DATA_BURST_SIZE (32 * 1024)
 
 /** A CREATE TABLE abstraction */
 typedef struct table_create

server/modules/routing/binlog/blr.c

@@ -79,7 +79,6 @@
 #include <sys/stat.h>
 #include <uuid/uuid.h>
 #include <maxscale/alloc.h>
-#include <maxscale/gw.h>
 
 static char *version_str = "V2.1.0";
 

server/modules/routing/binlog/blr_slave.c

@@ -85,7 +85,6 @@
 #include <maxscale/version.h>
 #include <zlib.h>
 #include <maxscale/alloc.h>
-#include <maxscale/gw.h>
 
 extern int load_mysql_users(SERV_LISTENER *listener);
 extern void blr_master_close(ROUTER_INSTANCE* router);
@@ -263,7 +262,7 @@ blr_slave_request(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave, GWBUF *queue)
     case COM_QUIT:
         MXS_DEBUG("COM_QUIT received from slave with server_id %d",
                   slave->serverid);
-        break;
+        return 1;
     default:
         blr_send_custom_error(slave->dcb, 1, 0,
                               "You have an error in your SQL syntax; Check the "