Commit Graph

521 Commits

Author SHA1 Message Date
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
01eafd92c8 Fixed two errors in show slave status output. Master_UUID was
showing the variable name rather than the value and
Master_SSL_Verify_Server_cert was missing
2015-02-10 10:00:02 +00:00
eafdd43592 Add Master_Server_Id value to returned show slave status command 2015-02-10 08:36:31 +00:00
faca6b6d76 Merge branch 'blr' into develop 2015-02-09 20:58:55 +00:00
390df414df Addition of doxygen comments 2015-02-09 20:56:50 +00:00
b58e09cdb7 Addition of some extra log messages and seconds behind master calcuation 2015-02-09 20:50:23 +00:00
958cc73176 Add support for SELECT @@server_id 2015-02-09 16:07:01 +00:00
e3c8979ee1 Fix for missing statistics increment 2015-02-09 13:19:51 +00:00
9d3b961c15 Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2015-02-06 20:47:03 +00:00
6da16c9958 Some tidy up of binlog rotuer code 2015-02-06 20:46:36 +00:00
2a06331f82 Fixed readwritesplit hashing function returning the key value instead of the hash value. 2015-02-06 22:09:28 +02:00
e91ad034a8 CRC issue 2015-02-06 17:53:41 +00:00
00c7dccdac Fix for checksum misisng in master rotate event 2015-02-06 14:30:15 +00:00
d4f5ca6bcb Merge branch 'blr' into develop
Addition of hashtable load and save. Caching of auth information
2015-02-06 11:52:51 +00:00
25e39f35c5 Fix to allow rotate of files without explicit rotate events when the master is offline 2015-02-06 11:45:20 +00: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
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
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
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
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
b758dc1a4a Clear residual buffered data when reconnecting to the master in all cases 2015-01-26 11:23:46 +00: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
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
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
06c2d201e0 remove makefiles and other garbage 2015-01-14 19:08:24 +02:00
b3824a1eaf Clean up bits and pieces, removed some unnecessary checks. 2015-01-14 14:11:19 +02:00
af415f58c3 Add support for select @@max_allowed_packet 2015-01-07 17:38:41 +00:00