Commit Graph

3095 Commits

Author SHA1 Message Date
21a77736bf Fixed session command error handling with backend DCBs that were already closed. 2015-02-24 13:44:01 +02:00
3b29e1a1f0 Fixed merging conflicts. 2015-02-24 06:34:22 +02:00
9e7afeb302 Merge branch 'develop' into MAX-324
Conflicts:
	macros.cmake
	server/core/config.c
	server/core/service.c
	server/modules/routing/CMakeLists.txt
2015-02-24 06:26:55 +02:00
5477cdf5eb Renamed the dbshard module to schemarouter. 2015-02-24 05:49:38 +02:00
aa4932bf2d Moved the housekeeper heartbeat to a separate header for ease of integration.
This keeps the behavior the same but allows the heartbeat to be used as a crude timer
without including everything the housekeeper.h header includes.

Moved the protocol level updates on the DCBs last_read value into dcb_read.
This keeps the implementation nice and compact.
2015-02-24 05:00:16 +02:00
4f108af0fb Fixed logs missing a single character when called with skygw_log_write_flush. 2015-02-23 20:26:19 +02:00
7afc9b5332 Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2015-02-23 20:00:08 +02:00
57f89f5689 Small optimizations to session timeouts. 2015-02-23 19:59:36 +02:00
0e1bcde5de Fixed compile errors for mm_mon.c
Fixed compile errors for mm_mon.c
2015-02-23 18:58:00 +01:00
4be2ffeecc Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2015-02-23 19:38:08 +02:00
ce7537505a Changed the RabbitMQ to be disabled by default. 2015-02-23 19:37:12 +02:00
cd1af56ced Amend contents page to include new design documents. 2015-02-23 14:32:21 +00:00
bc49d237d7 Merge branch 'timeout' into develop 2015-02-23 11:31:55 +02:00
578fb07370 Added timeout testing to service tests. 2015-02-23 11:13:31 +02:00
56d810ff80 Merge branch 'develop' into timeout 2015-02-23 10:28:55 +02:00
46c4fefb00 Fixes to coverity defects 87601 87557 87548 87547 87546 87545 87544 87536 87535 87529 87528 2015-02-22 22:29:30 +02:00
1d74295e8c Moved a function around. 2015-02-22 21:52:53 +02:00
c47d2f3791 Added session timeouts.
The parameter 'connection_timeout' for services takes a value as seconds.
All sessions that have been idle for longer than this will be disconnected.
2015-02-20 22:16:43 +02:00
fc969acc73 Added optional stripping of escape characters from database names when laoding users. 2015-02-20 21:07:12 +02:00
120e65d4b8 Fixed a null pointer reference when grants were given to user's hostname but not MaxScale's hostname. 2015-02-20 19:12:59 +02:00
22255a6045 Removed extra ; in soem blr_make_query calls - this breaks parsing when
one maxscale is chained from another
2015-02-20 16:07:09 +00:00
77a25c5848 Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2015-02-20 16:06:18 +00:00
ff57d22901 Merge branch 'maxinfo' of https://github.com/mariadb-corporation/MaxScale into maxinfo 2015-02-20 15:59:43 +00:00
d38e614f29 Removed extra ; from a few of the queries - this messes up chaining of MaxScale's 2015-02-20 15:58:46 +00:00
3145ebac43 Added documentation about the way that readwritesplit stores session commands. 2015-02-20 16:39:41 +02:00
7375725cc5 Addition of comment regarding users 2015-02-20 14:31:55 +00:00
0a635a0f9b Add new document to Docuemnt Contents page 2015-02-20 14:08:20 +00:00
75da5051b9 Initial maxinfo documentation 2015-02-20 14:04:50 +00:00
dd843784e8 Fix for /sessions URI and addition of /clients URI 2015-02-20 14:04:16 +00:00
83b7948cdf Added more debug output to user authentication. 2015-02-20 14:50:26 +02:00
7d07e5dd8a Fixed bug in like clause matching 2015-02-20 12:36:24 +00:00
a022775342 Addition of show eventtimes and /events/times URL to maxinfo 2015-02-20 11:53:47 +00:00
2c401788ee Fix to bug 579: http://bugs.mariadb.com/show_bug.cgi?id=579
Added actual testing routers and protocols.
2015-02-20 12:30:55 +02:00
039d3c4c0b Make JSON result sets produce nmeric valeus without quotes
Updated HTTPD protocol module to return application/json as the encoding
2015-02-20 10:09:01 +00:00
8eb14235d1 Addition of DCB and Poll statistics in show status output 2015-02-20 10:05:50 +00:00
326f0e2e1f Disabled RabbitMQ components. 2015-02-20 11:01:49 +02:00
68bf331ff9 Added more output to CMake configuration. 2015-02-20 10:53:45 +02:00
3f05050ed7 Increased the RPM package release number. 2015-02-20 10:33:45 +02:00
7fc004ec28 Merge branch 'develop' into MAX-324 2015-02-20 10:18:45 +02:00
cd986cba17 Updated galera monitor to use the new dcb_callforeach. 2015-02-20 10:18:24 +02:00
22f7137440 Fix to bug 600: http://bugs.mariadb.com/show_bug.cgi?id=600
readwritesplit now drops slave connections that fail a session command.
2015-02-20 06:38:38 +02:00
ea55572ab8 Merge branch 'develop' into MAX-324 2015-02-20 04:45:48 +02:00
3924f70d6b Fixed log manager sometimes not writing the last character in a log message.
This was caused by type conversions from int to size_t and the usage of the MAX macro.
2015-02-20 04:42:02 +02:00
093489d0d7 Added a new matching mode 'strict_all' and added it to the documentation. 2015-02-19 19:36:05 +02:00
c4e276328a Small changes to how query throttling works. 2015-02-19 18:56:43 +02:00
df3a548be1 Added basic REST interface to maxinfo plugin 2015-02-19 16:24:30 +00:00
c2cd3f4c3d Merge pull request #73 from tanji/serversjson
Output server list in JSON format
2015-02-19 16:56:02 +02:00
83f4daf925 Fixed error messages not being displayed. 2015-02-19 16:48:00 +02:00
20b075c67b Fixes to fwfilter rule processing. 2015-02-19 16:41:40 +02:00
11e65f02f0 Addition of maxinfo show modules and show monitors commands 2015-02-19 13:32:48 +00:00