hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into binlog_server_mariadb_master_encryption

Browse Source
This commit is contained in:
MassimilianoPinto
2016-10-17 12:20:23 +02:00
parent 3ce501a975 15de0a0fb3
commit cf3be88c75
26 changed files with 77 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/modules/routing/avro/avrorouter.h
View File

@ -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

1
server/modules/routing/binlog/blr.c
View File

@ -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";

3
server/modules/routing/binlog/blr_slave.c
View File

@ -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 "