1019 Commits

Author SHA1 Message Date
Mark Riddoch
85c752d15c Updated error handlign in lien with new requirements of the core 2015-02-04 12:15:34 +00:00
Mark Riddoch
add315d795 Updated to reflect the shange to the way servers are stored within services 2015-02-04 11:17:29 +00:00
Mark Riddoch
ea7260b27b Merge branch 'blr' into develop 2015-02-04 10:28:12 +00:00
Mark Riddoch
85a38c9600 Add fix for crash if no router options are supplied 2015-02-04 10:26:55 +00:00
Mark Riddoch
23d920c1a9 Addition of support for show slave status 2015-02-04 10:05:35 +00:00
Mark Riddoch
0083e62c41 Merge branch 'blr' into develop 2015-02-03 17:19:06 +00:00
Mark Riddoch
e9af90e4b6 Add support for:
select @@maxscale_version;
	show variables like "maxscale%"
	show master status
	show slave hosts
2015-02-03 17:14:37 +00:00
Mark Riddoch
048467b447 Fixed issue with simple parser for queries from slaves. 2015-02-03 14:35:22 +00:00
Markus Makela
fe32ab63f1 Removed documentation files from the wrong folders. 2015-01-30 20:57:48 +02:00
Markus Makela
ab6418c939 Fixes to RabbitMQ filter and consumer. 2015-01-30 18:03:20 +02:00
Mark Riddoch
15b2cb64ce Add a default value of uuid 2015-01-30 15:20:59 +00:00
Mark Riddoch
5ac736a14e Fix for CRC in fake rotate events 2015-01-30 14:55:14 +00:00
Mark Riddoch
a786d76852 Fixed typo 2015-01-29 16:04:06 +00:00
Mark Riddoch
00d9787d20 Fixed typo in error log message 2015-01-29 16:01:19 +00:00
Markus Makela
42d2f99006 Added fwfilter documentation. 2015-01-28 21:40:14 +02:00
VilhoRaatikka
a016fdd0b7 Complementary fix to #507, http://bugs.skysql.com/show_bug.cgi?id=507.
Missing braces in get_route_target made the previous fix ineffective.
2015-01-28 12:20:30 +02:00
Mark Riddoch
0a9509168b Addition of cache for server responses. This allows cached responses to be sent
if there is no master avaiable when MaxScale starts
2015-01-28 08:44:13 +00:00
VilhoRaatikka
21bb341c7d Fix to bug #507, http://bugs.mariadb.com/show_bug.cgi?id=507
readwritesplit.c:get_route_target routed query to slave although query type was combined QUERY_TYPE_READ | QUERY_TYPE_MASTER_READ, where the latter is supposed to be routed to master.
2015-01-27 15:21:31 +02:00
VilhoRaatikka
270c0ebf8a Clean up, added comments, removed some dead code. 2015-01-27 10:24:37 +02:00
Markus Makela
566831c9c5 Fix to bug 705: http://bugs.mariadb.com/show_bug.cgi?id=705
changed " to ' in queries so that ANSI_QUOTES works with sql_modes that use it.
2015-01-26 20:17:20 +02:00
Mark Riddoch
b758dc1a4a Clear residual buffered data when reconnecting to the master in all cases 2015-01-26 11:23:46 +00:00
MassimilianoPinto
92ebfb2eb9 Timeouts handling in NDB Monitor
Timeouts handling in NDB Monitor
2015-01-26 11:50:24 +01:00
MassimilianoPinto
ba5cab0af6 NDB Monitor update
NDB Monitor update
2015-01-26 11:35:21 +01:00
Mark Riddoch
9e642c32cb Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2015-01-22 15:09:01 +01:00
Mark Riddoch
41bc0ddd24 Addition of example filter to set routing hint to route to a named server
based on a regular expression match within the query text.
2015-01-22 15:08:06 +01:00
Markus Makela
81aa2b7c00 Removed redundant include from tee.c. 2015-01-20 12:52:39 +02:00
VilhoRaatikka
272cd73cad Fix to bug #701, http://bugs.mariadb.com/show_bug.cgi?id=701
debugcmd.c:execute_cmd:added skip counter which adjusts the starting position of next argument correctly thus avoiding cropping the latter quoted argument.
2015-01-19 18:38:46 +02:00
VilhoRaatikka
5d1f029260 New fix candidate to bug #698, http://bugs.mariadb.com/show_bug.cgi?id=698
client/test/maxadmin_test.sh: added new cases for testing maxadmin
service.c:dListListeners:fixed NULL-pointer reference
debugcli.h: replaced magic number 80 with constant integer.
cli.c:execute:fixed command buffer overflow
debugcmd.c:convert_arg:restored return value to 0 in case of error
2015-01-19 17:55:02 +02:00
VilhoRaatikka
fca674b16a modutil.c: added modutil_reply_auth_error
mysql_backend.c:gw_change_user: instead of setting flags directly to replybuffer, set server command to backend's protocol object and reply the message directly to backend where flags are set and it is replied back to client.
2015-01-19 00:01:08 +02:00
VilhoRaatikka
f5d8e2366a modutil.c:modutil_reply_routing_error: Removed GWBUF type flag setting and added flags argument to function prototype so that the caller can set necessary flags and they are then copied to GWBUF which is first created in modutil_reply_rounting_error. 2015-01-17 23:07:06 +02:00
VilhoRaatikka
6d2b38d4b6 Complementary fix to #694,http://bugs.mariadb.com/show_bug.cgi?id=694
RWSplit router handles query processing errors that happened in router by sending parse error reply to client. routeQuery fails only when backend has failed.
2015-01-17 22:40:52 +02:00
VilhoRaatikka
d362ed227f Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2015-01-17 01:29:50 +02:00
VilhoRaatikka
1a76d2d06f Fix to bug #698, http://bugs.mariadb.com/show_bug.cgi?id=698
debugcmd.c:convert_arg returned zero if argument is invalid. That zero was cast to pointer. Using it caused NULL-pointer references. Changed the return value indicating about error to 0x1 which is then handled properly.
2015-01-17 01:24:56 +02:00
Timofey Turenko
885dfb0242 Merge branch 'remove_makefiles' into develop 2015-01-16 18:04:16 +02:00
VilhoRaatikka
113ea8381b Complamentary fix to #694, added error flag reset to readconnrouter as well. 2015-01-16 11:56:20 +02:00
VilhoRaatikka
da77da803b Complementory fix to bug #694, http://bugs.mariadb.com/show_bug.cgi?id=694
Added new error action to router.h, added functionality to reset error flag from DCB in handleError. Error is reset before every new routing call.
2015-01-16 11:13:42 +02:00
VilhoRaatikka
c5c9165a26 Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2015-01-15 15:21:58 +02:00
VilhoRaatikka
39e4253c81 Fix to bug #694, http://bugs.mariadb.com/show_bug.cgi?id=694
query_classifier.cc: set_query_type lost previous query type if the new was more restrictive. Problem was that if query is both READ and SESSION_WRITE and configuration parameter use_sql_variables_in=all was set, routing target became ambiguous. Replaced call to set_query_type with simply adding new type to type (=bit field) and checking unsupported combinations in readwritesplit.c:get_route_target. If such a case is met, a detailed error is written to error log in readwritesplit.c. mysql_client.c sees the error code and sends an error to client. Then mysql_client.c calls router's handleError which ensures that there are enough backend servers so that the session can continue.
2015-01-15 15:16:22 +02:00
Markus Makela
533042b61a Fixes to coverity defects from 85514 up to 85529. 2015-01-15 14:09:11 +02:00
Markus Makela
88a26f03ab Fix to bug 685: http://bugs.mariadb.com/show_bug.cgi?id=685
Added the missing detection of partial packets in the buffers.
2015-01-15 13:13:09 +02:00
Markus Makela
85c84c9e71 Fixed debug variables being used out of debug blocks. 2015-01-15 05:11:08 +02:00
Markus Makela
b635eb1493 Additional debugging info added to tee filter. 2015-01-14 21:13:52 +02:00
Timofey Turenko
7e05d4d716 Merge branch 'develop' into remove_makefiles 2015-01-14 19:09:43 +02:00
Timofey Turenko
06c2d201e0 remove makefiles and other garbage 2015-01-14 19:08:24 +02:00
Markus Makela
5c210455fa Fixed variable declaration being inside a debug build only block. 2015-01-14 18:20:59 +02:00
VilhoRaatikka
b3824a1eaf Clean up bits and pieces, removed some unnecessary checks. 2015-01-14 14:11:19 +02:00
Markus Makela
df2297aa6c Added missing command types that possibly receive multiple packets to tee.c. 2015-01-13 22:10:47 +02:00
Markus Makela
b4c01cf956 Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2015-01-13 21:39:41 +02:00
Markus Makela
7f4675cd57 Fix to bug 685: http://bugs.mariadb.com/show_bug.cgi?id=685
Added the missing ERR packet detection to modutil functions.
2015-01-13 21:32:04 +02:00
VilhoRaatikka
61efbfe687 Added comment to mysql_backend.c:process_response_data 2015-01-13 09:52:54 +02:00