Commit Graph

1081 Commits

Author SHA1 Message Date
82c03bd240 Merge branch 'develop' into MAX-345 2015-02-06 12:29:19 +01:00
adc0bb4f70 Comments added for fix #714
Comments added for fix #714
2015-02-06 11:50:21 +01:00
98cbc34c6c Fix for bug #714
Fix for bug #714
2015-02-06 11:26:48 +01:00
b2e3de0362 Merge branch 'develop' into MAX-345 2015-02-05 16:14:36 +01:00
c611d63e94 Added protection for buffer overrun in COM_BINLOG_DUMP. 2015-02-05 09:37:56 +00:00
b9f36d6489 Addition of checksum handling in COM_BINLOG_DUMP 2015-02-05 09:15:45 +00:00
625a7d7a10 Assertion removed
Assertion removed
2015-02-04 18:31:38 +01:00
0cf1a35511 Removed useless assertion
Removed useless assertion
2015-02-04 17:19:07 +01:00
07536611d3 Add ability to extract values from the result set
Extract and action the @master_binlog_checksum value

Store master's uuid for use in show slave status

Support for MariaDB 5.5 masters
2015-02-04 15:59:28 +00:00
4ef3677b84 Fix for Bug #519
Fix for Bug #519
2015-02-04 16:17:36 +01:00
6bd8d1b507 Updated options procesign to allow either password= or passwd= for
compatibility with the way we set passwords in other places
2015-02-04 13:12:19 +00:00
8ddb2fa732 Update to support servers that do not support GTID 2015-02-04 13:10:46 +00:00
85c752d15c Updated error handlign in lien with new requirements of the core 2015-02-04 12:15:34 +00:00
add315d795 Updated to reflect the shange to the way servers are stored within services 2015-02-04 11:17:29 +00:00
ea7260b27b Merge branch 'blr' into develop 2015-02-04 10:28:12 +00:00
85a38c9600 Add fix for crash if no router options are supplied 2015-02-04 10:26:55 +00:00
23d920c1a9 Addition of support for show slave status 2015-02-04 10:05:35 +00:00
0083e62c41 Merge branch 'blr' into develop 2015-02-03 17:19:06 +00:00
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
048467b447 Fixed issue with simple parser for queries from slaves. 2015-02-03 14:35:22 +00:00
fe32ab63f1 Removed documentation files from the wrong folders. 2015-01-30 20:57:48 +02:00
ab6418c939 Fixes to RabbitMQ filter and consumer. 2015-01-30 18:03:20 +02:00
15b2cb64ce Add a default value of uuid 2015-01-30 15:20:59 +00:00
5ac736a14e Fix for CRC in fake rotate events 2015-01-30 14:55:14 +00:00
a786d76852 Fixed typo 2015-01-29 16:04:06 +00:00
00d9787d20 Fixed typo in error log message 2015-01-29 16:01:19 +00:00
42d2f99006 Added fwfilter documentation. 2015-01-28 21:40:14 +02:00
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
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
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
270c0ebf8a Clean up, added comments, removed some dead code. 2015-01-27 10:24:37 +02:00
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
b758dc1a4a Clear residual buffered data when reconnecting to the master in all cases 2015-01-26 11:23:46 +00:00
92ebfb2eb9 Timeouts handling in NDB Monitor
Timeouts handling in NDB Monitor
2015-01-26 11:50:24 +01:00
ba5cab0af6 NDB Monitor update
NDB Monitor update
2015-01-26 11:35:21 +01:00
9e642c32cb Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2015-01-22 15:09:01 +01:00
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
81aa2b7c00 Removed redundant include from tee.c. 2015-01-20 12:52:39 +02:00
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
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
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
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
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
d362ed227f Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2015-01-17 01:29:50 +02:00
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
885dfb0242 Merge branch 'remove_makefiles' into develop 2015-01-16 18:04:16 +02:00
113ea8381b Complamentary fix to #694, added error flag reset to readconnrouter as well. 2015-01-16 11:56:20 +02:00
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
c5c9165a26 Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2015-01-15 15:21:58 +02:00
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