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

Merge branch 'develop' into MXS-230

Browse Source
This commit is contained in:
Markus Makela
2015-07-07 19:45:42 +03:00
parent c8173ec4f7 03b5a634f4
commit b47da33a33
5 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Documentation/Release-Notes/MaxScale-1.2.0-Release-Notes.md
View File

@ -29,3 +29,29 @@ MaxScale now supports SSL/TLS encrypted connections to MaxScale.
### Monitor scripts ### Monitor scripts
State changes in backend servers can now trigger the execution of a custom script. With this you can easily customize MaxScale's behavior. State changes in backend servers can now trigger the execution of a custom script. With this you can easily customize MaxScale's behavior.
## Bug fixes
Here is a list of bugs fixed since the release of MaxScale 1.1.1.
| Key | Summary |
| --- | -------- |
| [MXS-24](https://mariadb.atlassian.net/browse/MXS-24) | bugzillaId-604: Module load path documentation issues ... |
| [MXS-40](https://mariadb.atlassian.net/browse/MXS-40) | Display logged in users |
| [MXS-113](https://mariadb.atlassian.net/browse/MXS-113) | MaxScale seems to fail if built against MariaDB 10.0 libraries |
| [MXS-116](https://mariadb.atlassian.net/browse/MXS-116) | Do not run maxscale as root. |
| [MXS-125](https://mariadb.atlassian.net/browse/MXS-125) | inconsistency in maxkeys/maxpassword output and parameters |
| [MXS-136](https://mariadb.atlassian.net/browse/MXS-136) | Check for MaxScale replication heartbeat table existence before creating |
| [MXS-137](https://mariadb.atlassian.net/browse/MXS-137) | cannot get sql for queries with length >= 0x80 |
| [MXS-139](https://mariadb.atlassian.net/browse/MXS-139) | Schemarouter authentication for wildcard grants fails without optimize_wildcard |
| [MXS-140](https://mariadb.atlassian.net/browse/MXS-140) | strip_db_esc does not work without auth_all_servers |
| [MXS-162](https://mariadb.atlassian.net/browse/MXS-162) | Fix Incorrect info in Configuration Guide |
| [MXS-163](https://mariadb.atlassian.net/browse/MXS-163) | Reload config leaks memory |
| [MXS-165](https://mariadb.atlassian.net/browse/MXS-165) | Concurrency issue while incrementing sessions in qlafilter |
| [MXS-166](https://mariadb.atlassian.net/browse/MXS-166) | Memory leak when creating a new event |
| [MXS-171](https://mariadb.atlassian.net/browse/MXS-171) | Allow reads on master for readwritesplit |
| [MXS-176](https://mariadb.atlassian.net/browse/MXS-176) | Missing dependencies in documentation |
| [MXS-181](https://mariadb.atlassian.net/browse/MXS-181) | Poor performance on TCP connection due to Nagle's algoritm |
| [MXS-212](https://mariadb.atlassian.net/browse/MXS-212) | Stopped services accept connections |
| [MXS-225](https://mariadb.atlassian.net/browse/MXS-225) | RPM Debug build packages have no debugging symbols |
| [MXS-227](https://mariadb.atlassian.net/browse/MXS-227) | Memory leak in Galera Monitor |

2
cmake/testall.cmake
View File

@ -1,4 +1,4 @@
execute_process(COMMAND /bin/sh -c "${CMAKE_BINARY_DIR}/bin/maxscale -f ${CMAKE_BINARY_DIR}/maxscale.cnf --logdir=${CMAKE_BINARY_DIR}/ --datadir=${CMAKE_BINARY_DIR}/ --cachedir=${CMAKE_BINARY_DIR}/ &> ${CMAKE_BINARY_DIR}/maxscale.output" execute_process(COMMAND /bin/sh -c "${CMAKE_BINARY_DIR}/bin/maxscale -f ${CMAKE_BINARY_DIR}/maxscale.cnf --logdir=${CMAKE_BINARY_DIR}/ --datadir=${CMAKE_BINARY_DIR}/ --cachedir=${CMAKE_BINARY_DIR}/ --piddir=${CMAKE_BINARY_DIR}/ &> ${CMAKE_BINARY_DIR}/maxscale.output"
OUTPUT_VARIABLE MAXSCALE_OUT) OUTPUT_VARIABLE MAXSCALE_OUT)
execute_process(COMMAND make test RESULT_VARIABLE RVAL) execute_process(COMMAND make test RESULT_VARIABLE RVAL)
execute_process(COMMAND killall maxscale) execute_process(COMMAND killall maxscale)

2
server/core/service.c
View File

@ -125,7 +125,7 @@ SERVICE *service;
"Error : Unable to load %s module \"%s\".\n\t\t\t" "Error : Unable to load %s module \"%s\".\n\t\t\t"
" Ensure that lib%s.so exists in one of the " " Ensure that lib%s.so exists in one of the "
"following directories :\n\t\t\t " "following directories :\n\t\t\t "
"- %s/modules\n%s%s", "- %s\n%s%s",
MODULE_ROUTER, MODULE_ROUTER,
router, router,
router, router,

4
server/modules/routing/readwritesplit/readwritesplit.c
View File

@ -3787,7 +3787,7 @@ static GWBUF* sescmd_cursor_process_replies(
dcb_close(bref->bref_dcb); dcb_close(bref->bref_dcb);
*reconnect = true; *reconnect = true;
if(replybuf) if(replybuf)
gwbuf_consume(replybuf,gwbuf_length(replybuf)); while((replybuf = gwbuf_consume(replybuf,gwbuf_length(replybuf))));
} }
} }
/** This is a response from the master and it is the "right" one. /** This is a response from the master and it is the "right" one.
@ -3830,7 +3830,7 @@ static GWBUF* sescmd_cursor_process_replies(
skygw_log_write(LOGFILE_DEBUG,"Slave '%s' responded faster to a session command.", skygw_log_write(LOGFILE_DEBUG,"Slave '%s' responded faster to a session command.",
bref->bref_backend->backend_server->unique_name); bref->bref_backend->backend_server->unique_name);
if(replybuf) if(replybuf)
gwbuf_free(replybuf); while((replybuf = gwbuf_consume(replybuf,gwbuf_length(replybuf))));
return NULL; return NULL;
} }

4
server/modules/routing/schemarouter/sharding_common.c
View File

@ -46,7 +46,7 @@ bool extract_database(GWBUF* buf, char* str)
tok = strtok_r(query," ;",&saved); tok = strtok_r(query," ;",&saved);
if(tok == NULL || strcasecmp(tok,"use") != 0) if(tok == NULL || strcasecmp(tok,"use") != 0)
{ {
skygw_log_write(LOGFILE_ERROR,"Schemarouter: Malformed chage database packet."); skygw_log_write(LOGFILE_ERROR,"extract_database: Malformed chage database packet.");
succp = false; succp = false;
goto retblock; goto retblock;
} }
@ -54,7 +54,7 @@ bool extract_database(GWBUF* buf, char* str)
tok = strtok_r(NULL," ;",&saved); tok = strtok_r(NULL," ;",&saved);
if(tok == NULL) if(tok == NULL)
{ {
skygw_log_write(LOGFILE_ERROR,"Schemarouter: Malformed chage database packet."); skygw_log_write(LOGFILE_ERROR,"extract_database: Malformed chage database packet.");
succp = false; succp = false;
goto retblock; goto retblock;
} }