0a468a910b
Makefile modifications
...
Makefile modifications
2014-09-11 13:10:02 +02:00
8b5b4a17fe
Merge from Z3
...
Merge from Z3
2014-09-11 12:51:16 +02:00
7245d1baa1
blr branch merge
...
blr branch merge
2014-09-11 12:20:42 +02:00
c273988e51
Fixed for EPOLLHUP events
...
Possible double free in maxscaled on close
binlog router debugging/tracing
2014-09-05 17:29:17 +01:00
4a30626974
Merge branch 'Z2' of https://github.com/skysql/MaxScale into Z2
...
Conflicts:
client/Makefile
server/core/buffer.c
server/core/test/makefile
server/include/buffer.h
server/modules/filter/Makefile
server/modules/routing/webserver.c
2014-08-29 16:21:08 +03:00
81e1dd8719
Merge branch 'develop' into blr
...
Add instrumentation
Remove mutexes
Improve gwbuf_append performance
Conflicts:
server/core/dcb.c
server/modules/protocol/mysql_backend.c
2014-08-28 11:41:26 +01:00
fb87f68368
consistently use DEL instead of rm in Makefiles
2014-08-17 21:02:24 +00:00
3a639403bf
added fixes to core tests failing even though they passed, hint syntax test only checking for a partial logfile and readwritesplit tests being run twice.
2014-08-11 14:27:33 +03:00
87e66a0ea8
Revert "Implementation of HTTPD protocol, gwbuf properties and a dmeo web application"
...
This reverts commit 6fd5dff34902051f38932947493280e1e62dbeb1.
2014-07-15 17:53:39 +01:00
6fd5dff349
Implementation of HTTPD protocol, gwbuf properties and a dmeo web application
...
interface to test the new httpd.
2014-07-15 17:39:31 +01:00
d58682d261
Updated Makefile to resolve issue with adding extra MaxScale in the
...
path for a make install command.
2014-07-01 16:53:10 +01:00
719503e471
Addition of new client utility, maxadmin.
...
Supporting protocol for the admin interface
New routing module, cli, which shares source with debugcli
Tidyup output of lsit commands
2014-06-13 23:40:07 +01:00
fda9b1c706
Merge branch 'develop' into blr
...
Conflicts:
server/core/dcb.c
server/modules/include/blr.h
server/modules/routing/binlog/STATUS
server/modules/routing/binlog/blr.c
server/modules/routing/binlog/blr_file.c
server/modules/routing/binlog/blr_master.c
server/modules/routing/binlog/blr_slave.c
2014-06-08 00:50:36 +01:00
c23773c977
Removed binlog path
...
Removed binlog path
2014-05-26 12:40:56 +02:00
78c5c407bd
Fixed conflict
2014-05-23 16:43:11 +01:00
45d5d521b8
Merge branch 'blr' into cenh
...
Conflicts:
Documentation/MaxScale Configuration And Usage Scenarios.pdf
server/core/config.c
server/core/dcb.c
server/core/service.c
server/modules/routing/Makefile
server/modules/routing/debugcmd.c
server/modules/routing/readwritesplit/readwritesplit.c
server/modules/routing/readwritesplit/test/rwsplit.sh
2014-05-23 16:39:39 +01:00
9777e83a5a
Merge branch 'master' into blr
2014-05-19 13:46:47 +01:00
1d08b0100f
Initial binlog prototype
...
Supports pulling binlogs from the master, caching to a local file and relaying to a slave.
Only tested with a single slave and a single MaxScale thread.
2014-05-13 16:06:05 +01:00
ce5dc19ecc
Added read/write split router tests to a part of makefile structure.
2014-04-01 14:11:48 -07:00
f3cf1d703e
Removed depend.mk files. Added command 'touch depend.mk' to each Makefile which attempts to include depend.mk. That is for the makefile process phase where only the existence of depend.mk is checked. Later the real file is created in 'depend' target.
2013-07-30 11:43:39 +03:00
a7c82310f9
moving files to /server to make merge possible
2013-07-28 05:31:11 +00:00
