Merge branch 'develop' into MXS-212

server/modules/include/blr.h

@@ -34,6 +34,7 @@
 #include <pthread.h>
 
 #include <memlog.h>
+#include <zlib.h>
 
 #define BINLOG_FNAMELEN		16
 #define BLR_PROTOCOL		"MySQLBackend"

server/modules/monitor/mmmon.c

@@ -126,6 +126,7 @@ startMonitor(void *arg,void* opt)
 	handle->shutdown = 0;
 	handle->id = MONITOR_DEFAULT_ID;
 	handle->master = NULL;
+	handle->script = NULL;
 	memset(handle->events,false,sizeof(handle->events));
 	spinlock_init(&handle->lock);
     }

server/modules/routing/binlog/blr_file.c

@@ -210,9 +210,8 @@ int		fd;
 	close(router->binlog_fd);
 	spinlock_acquire(&router->binlog_lock);
 	strncpy(router->binlog_name, file,BINLOG_FNAMELEN);
-	blr_file_add_magic(router, fd);
-	spinlock_release(&router->binlog_lock);
 	router->binlog_fd = fd;
+	spinlock_release(&router->binlog_lock);
 	return 1;
 }
 
@@ -254,12 +253,13 @@ int		fd;
 	                LOGIF(LE, (skygw_log_write(LOGFILE_ERROR,
 				"%s: binlog file %s has an invalid length %d.",
 				router->service->name, path, router->binlog_position)));
-                    close(fd);
+			close(fd);
+			spinlock_release(&router->binlog_lock);
 			return;
 		}
 	}
-	spinlock_release(&router->binlog_lock);
 	router->binlog_fd = fd;
+	spinlock_release(&router->binlog_lock);
 }
 
 /**

server/modules/routing/binlog/blr_slave.c

@@ -1693,6 +1693,9 @@ uint32_t	chksum;
 
 	binlognamelen = strlen(slave->binlogfile);
 	len = 19 + 8 + 4 + binlognamelen;
+	/* no slave crc, remove 4 bytes */
+	if (slave->nocrc)
+		len -= 4;
 
 	// Build a fake rotate event
 	resp = gwbuf_alloc(len + 5);
@@ -1711,17 +1714,19 @@ uint32_t	chksum;
 	memcpy(ptr, slave->binlogfile, binlognamelen);
 	ptr += binlognamelen;
 
-	/*
-	 * Now add the CRC to the fake binlog rotate event.
-	 *
-	 * The algorithm is first to compute the checksum of an empty buffer
-	 * and then the checksum of the event portion of the message, ie we do not
-	 * include the length, sequence number and ok byte that makes up the first
-	 * 5 bytes of the message. We also do not include the 4 byte checksum itself.
-	 */
-	chksum = crc32(0L, NULL, 0);
-	chksum = crc32(chksum, GWBUF_DATA(resp) + 5, hdr.event_size - 4);
-	encode_value(ptr, chksum, 32);
+	if (!slave->nocrc) {
+		/*
+		 * Now add the CRC to the fake binlog rotate event.
+		 *
+		 * The algorithm is first to compute the checksum of an empty buffer
+		 * and then the checksum of the event portion of the message, ie we do not
+		 * include the length, sequence number and ok byte that makes up the first
+		 * 5 bytes of the message. We also do not include the 4 byte checksum itself.
+		 */
+		chksum = crc32(0L, NULL, 0);
+		chksum = crc32(chksum, GWBUF_DATA(resp) + 5, hdr.event_size - 4);
+		encode_value(ptr, chksum, 32);
+	}
 
 	slave->dcb->func.write(slave->dcb, resp);
 	return 1;