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

fix:cannot connect to maxinfo with python client

Browse Source
This commit is contained in:
Dapeng Huang
2018-01-13 12:54:12 +08:00
committed by Markus Mäkelä
parent 2b653887a3
commit 454f195cb0
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.gitignore vendored
View File

@ -51,3 +51,12 @@ CMakeFiles/*
*/*/*/*/CMakeFiles/* */*/*/*/CMakeFiles/*
Makefile Makefile
/.DS_Store /.DS_Store
# Netbeans Project files
nbproject/
/build/
# RBCommons
.reviewboardrc
# vscode
.vscode

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

@ -61,7 +61,7 @@ static int maxinfo_statistics(INFO_INSTANCE *, INFO_SESSION *, GWBUF *);
static int maxinfo_ping(INFO_INSTANCE *, INFO_SESSION *, GWBUF *); static int maxinfo_ping(INFO_INSTANCE *, INFO_SESSION *, GWBUF *);
static int maxinfo_execute_query(INFO_INSTANCE *, INFO_SESSION *, char *); static int maxinfo_execute_query(INFO_INSTANCE *, INFO_SESSION *, char *);
static int handle_url(INFO_INSTANCE *instance, INFO_SESSION *router_session, GWBUF *queue); static int handle_url(INFO_INSTANCE *instance, INFO_SESSION *router_session, GWBUF *queue);
static int maxinfo_send_ok(DCB *dcb);
/* The router entry points */ /* The router entry points */
static MXS_ROUTER *createInstance(SERVICE *service, char **options); static MXS_ROUTER *createInstance(SERVICE *service, char **options);
@ -356,7 +356,7 @@ execute(MXS_ROUTER *rinstance, MXS_ROUTER_SESSION *router_session, GWBUF *queue)
switch (MYSQL_COMMAND(queue)) switch (MYSQL_COMMAND(queue))
{ {
case COM_PING: case COM_PING:
rc = maxinfo_ping(instance, session, queue); rc = maxinfo_send_ok(session->dcb);
break; break;
case COM_STATISTICS: case COM_STATISTICS:
rc = maxinfo_statistics(instance, session, queue); rc = maxinfo_statistics(instance, session, queue);
@ -618,7 +618,7 @@ maxinfo_execute_query(INFO_INSTANCE *instance, INFO_SESSION *session, char *sql)
respond_starttime(session->dcb); respond_starttime(session->dcb);
return 1; return 1;
} }
if (strcasecmp(sql, "set names 'utf8'") == 0) if (strncasecmp(sql, "set names", 9) == 0)
{ {
return maxinfo_send_ok(session->dcb); return maxinfo_send_ok(session->dcb);
} }
@ -626,6 +626,10 @@ maxinfo_execute_query(INFO_INSTANCE *instance, INFO_SESSION *session, char *sql)
{ {
return maxinfo_send_ok(session->dcb); return maxinfo_send_ok(session->dcb);
} }
if (strncasecmp(sql, "set @@session", 13) == 0)
{
return maxinfo_send_ok(session->dcb);
}
if (strncasecmp(sql, "set autocommit", 14) == 0) if (strncasecmp(sql, "set autocommit", 14) == 0)
{ {
return maxinfo_send_ok(session->dcb); return maxinfo_send_ok(session->dcb);