561952e1ea
Moved service definition to router_options for shardrouter.
2015-02-26 20:34:35 +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
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
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
83b7948cdf
Added more debug output to user authentication.
2015-02-20 14:50:26 +02: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
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
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
eacd41d5da
Use plural for command
2015-02-19 13:57:02 +01:00
b8b75b604f
Make JSON output valid
2015-02-19 13:55:29 +01:00
72eb89a787
Add forgotten include of JSON function
2015-02-19 11:22:17 +01:00
e047247200
Add command to print all servers in JSON format
2015-02-19 10:07:31 +01:00
8b8512890d
Added stats to mqfilter and moved the actual sending of the messages to a separate housekeeper task.
2015-02-18 15:20:40 +02:00
2dc553fe6e
Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop
2015-02-18 13:16:59 +02:00
65e2572ad0
Made config_truth_value non-static.
2015-02-18 13:16:06 +02:00
92e99ddfb7
Auto set router->masterid from master server-id
...
Automatically set router->masterid if not specified in the option: it’s
taken from master server-id
2015-02-18 11:04:50 +01:00
03456b931b
Added "yes" and "no" to the config truth value check and added the function to the header.
2015-02-18 11:45:01 +02:00
da029140cd
dcb_call_foreach now only calls the callbacks for those DCBs that are connected to the server.
2015-02-18 05:36:39 +02:00
ce063caf56
Fixed stopped monitors getting a call to monitorStop.
2015-02-17 21:47:11 +02:00
517524a8b4
Addition of DISCONNECT ALL and DISCONNECT SERVER
...
Addition of DISCONNECT ALL and DISCONNECT SERVER server_id
Added dbc_close in closeSession
Changed slave mode output display in diagnostics
2015-02-17 18:29:03 +01:00
dc65c9e1cc
Fix to bug 729: http://bugs.mariadb.com/show_bug.cgi?id=729
...
Prepared statements with a SELECT statement were falsely detected as SELECT queries with session variable modification.
This caused the error message and the failure to route the query.
2015-02-17 18:29:24 +02:00
865cd82fee
Addition of slave port and username in diagnostics
...
Addition of slave port and username in diagnostics
2015-02-17 11:32:41 +01:00
02e11b96b0
Changed references of dbshard into shardrouter in shardrouter.c
2015-02-17 12:14:48 +02:00
a2bff1dcea
Merge branch 'develop' into MAX-324
2015-02-16 14:58:35 +02:00
f54b57d987
Fixed modutil_replace_SQL not modifying the packet length when the replacement was shorter.
2015-02-16 12:10:48 +02:00
9dfa4378b4
Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop
2015-02-16 09:21:38 +00:00
d7da8c5297
Code cleanup
2015-02-16 09:21:11 +00:00
4e5c4c0b6a
Fix to bug 568: http://bugs.mariadb.com/show_bug.cgi?id=568
...
Changed strtok calls to strtok_r where needed.
2015-02-16 09:25:41 +02:00
cd99d6c1dd
Fixes to Coverity defects 87073, 87388.
2015-02-16 09:11:55 +02:00
37360eb02e
Merge pull request #72 from hholzgra/hartmut-warnings-2nd
...
"Hartmut warnings 2nd" merged.
2015-02-15 20:26:09 +02:00
