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

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2017-11-27 09:11:25 +02:00
parent 24c5b02a32 a72956e2f3
commit 589c52fb57
157 changed files with 6042 additions and 1673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/modules/routing/binlogrouter/blr.c
View File

@ -646,11 +646,6 @@ createInstance(SERVICE *service, char **options)
}
}
}
else
{
MXS_ERROR("%s: Error: No router options supplied for binlogrouter",
service->name);
}
inst->orig_masterid = 0;
inst->mariadb10_gtid_domain = BLR_DEFAULT_GTID_DOMAIN_ID;
@ -831,6 +826,7 @@ createInstance(SERVICE *service, char **options)
ssl_cfg->ssl_init_done = false;
ssl_cfg->ssl_method_type = SERVICE_SSL_TLS_MAX;
ssl_cfg->ssl_cert_verify_depth = 9;
ssl_cfg->ssl_verify_peer_certificate = true;
/** Set SSL pointer in in server struct */
server->server_ssl = ssl_cfg;
@ -872,10 +868,10 @@ createInstance(SERVICE *service, char **options)
{
if (rc == -1)
{
MXS_ERROR("%s: master.ini file not found in %s."
" Master registration cannot be started."
" Configure with CHANGE MASTER TO ...",
inst->service->name, inst->binlogdir);
MXS_WARNING("%s: master.ini file not found in %s."
" Master registration cannot be started."
" Configure with CHANGE MASTER TO ...",
inst->service->name, inst->binlogdir);
}
else
{

1
server/modules/routing/binlogrouter/blr.h
View File

@ -532,6 +532,7 @@ typedef struct router_slave
char *mariadb_gtid; /*< MariaDB 10 Slave connects with GTID */
sqlite3 *gtid_maps; /*< GTID storage client handle, read only*/
MARIADB_GTID_INFO f_info; /*< GTID info for file name prefix */
bool annotate_rows; /*< MariaDB 10 Slave requests ANNOTATE_ROWS */
#if defined(SS_DEBUG)
skygw_chk_t rses_chk_tail;
#endif

2
server/modules/routing/binlogrouter/test/testbinlog.c
View File

@ -49,7 +49,7 @@
#include <maxscale/version.h>
// This isn't really a clean way of testing
#include "../../../../core/maxscale/service.h"
#include "../../../../core/internal/service.h"
static void printVersion(const char *progname);
static void printUsage(const char *progname);

12
server/modules/routing/debugcli/debugcmd.c
View File

@ -56,12 +56,12 @@
#include <debugcli.h>
#include "../../../core/maxscale/config_runtime.h"
#include "../../../core/maxscale/maxscale.h"
#include "../../../core/maxscale/modules.h"
#include "../../../core/maxscale/monitor.h"
#include "../../../core/maxscale/poll.h"
#include "../../../core/maxscale/session.h"
#include "../../../core/internal/config_runtime.h"
#include "../../../core/internal/maxscale.h"
#include "../../../core/internal/modules.h"
#include "../../../core/internal/monitor.h"
#include "../../../core/internal/poll.h"
#include "../../../core/internal/session.h"
#define MAXARGS 12

8
server/modules/routing/maxinfo/maxinfo.c
View File

@ -52,10 +52,10 @@
#include <maxscale/users.h>
#include <maxscale/protocol/mysql.h>
#include "../../../core/maxscale/modules.h"
#include "../../../core/maxscale/monitor.h"
#include "../../../core/maxscale/session.h"
#include "../../../core/maxscale/poll.h"
#include "../../../core/internal/modules.h"
#include "../../../core/internal/monitor.h"
#include "../../../core/internal/session.h"
#include "../../../core/internal/poll.h"
extern char *create_hex_sha1_sha1_passwd(char *passwd);

10
server/modules/routing/maxinfo/maxinfo_exec.c
View File

@ -45,11 +45,11 @@
#include <maxscale/spinlock.h>
#include <maxscale/version.h>
#include "../../../core/maxscale/maxscale.h"
#include "../../../core/maxscale/modules.h"
#include "../../../core/maxscale/monitor.h"
#include "../../../core/maxscale/poll.h"
#include "../../../core/maxscale/session.h"
#include "../../../core/internal/maxscale.h"
#include "../../../core/internal/modules.h"
#include "../../../core/internal/monitor.h"
#include "../../../core/internal/poll.h"
#include "../../../core/internal/session.h"
static void exec_show(DCB *dcb, MAXINFO_TREE *tree);
static void exec_select(DCB *dcb, MAXINFO_TREE *tree);

5
server/modules/routing/readwritesplit/rwsplit_mysql.cc
View File

@ -160,8 +160,11 @@ log_transaction_status(RWSplitSession *rses, GWBUF *querybuf, uint32_t qtype)
unsigned char command = packet[4];
int len = 0;
char* sql;
modutil_extract_SQL(querybuf, &sql, &len);
char *qtypestr = qc_typemask_to_string(qtype);
if (!modutil_extract_SQL(querybuf, &sql, &len))
{
sql = (char*)"<non-SQL>";
}
if (len > RWSPLIT_TRACE_MSG_LEN)
{