Commit Graph

2488 Commits

Author SHA1 Message Date
705328012c Merge branch 'develop' into MAX-324 2015-01-23 06:45:51 +02:00
8791cc455e Added the initial implementation of the shardrouter module. 2015-01-23 06:40:30 +02: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
db1ea422a0 Merge branch 'develop' into MAX-324
Conflicts:
	server/core/modutil.c
2015-01-20 04:25:40 +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
9c34125a59 Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2015-01-19 00:04:01 +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
d45cae2ee7 Seaprated the RabbitMQ consumer from MaxScale's build system. 2015-01-18 12:34:32 +02:00
b2505fd660 Fix to bug 683: http://bugs.mariadb.com/show_bug.cgi?id=683
Added a check for MySQL version and a warning for the user about versions older than 5.5.40.
2015-01-18 06:24:51 +02:00
d4d9304dab Removed unused values. 2015-01-18 06:08:38 +02:00
66db37341d Updates all references to INSTALL_DIR with CMAKE_INSTALL_PREFIX. 2015-01-18 05:55:29 +02:00
e79ea8bc3e Removed INSTALL_DIR due to bug 689 being fixed and updated README to use 'cmake -LH' instead of listing the variables. 2015-01-18 05:29:37 +02:00
b0f1af7a40 Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2015-01-18 05:21:00 +02:00
3af1e895c7 Updated SETUP contents, fixed CMAKE_INSTALL_PREFIX not affecting the install destination and added a WITHOUT_MAXADMIN flag. 2015-01-18 05:20:05 +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
bbbdc28440 Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2015-01-17 22:42:57 +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
3eb686223e Add OpenSUSE comments and link to MariaDB repository configuration instruction to README 2015-01-17 18:44:49 +02:00
8877d00695 Updated README 2015-01-17 18:10:23 +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
ba84370b36 fix type in macros.cmake 2015-01-16 18:12:08 +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
f2ceaf166f Commented out old code and fixed a memory leak. 2015-01-16 07:41:10 +02:00
f54d4a76aa Final implementation of client session based sharding. 2015-01-15 20:24:01 +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
533042b61a Fixes to coverity defects from 85514 up to 85529. 2015-01-15 14:09:11 +02:00
db70163373 Merge branch 'develop' into MAX-324
Conflicts:
	query_classifier/query_classifier.cc
2015-01-15 13:17:42 +02:00
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
85c84c9e71 Fixed debug variables being used out of debug blocks. 2015-01-15 05:11:08 +02:00
30d2742294 Fixed garbled data at end of modutil.c 2015-01-15 04:40:33 +02:00
b635eb1493 Additional debugging info added to tee filter. 2015-01-14 21:13:52 +02:00
7e05d4d716 Merge branch 'develop' into remove_makefiles 2015-01-14 19:09:43 +02:00
06c2d201e0 remove makefiles and other garbage 2015-01-14 19:08:24 +02:00
5c210455fa Fixed variable declaration being inside a debug build only block. 2015-01-14 18:20:59 +02:00
b3824a1eaf Clean up bits and pieces, removed some unnecessary checks. 2015-01-14 14:11:19 +02:00
c1ed24aa78 Initial implementation of session based sharding. 2015-01-14 10:47:04 +02:00
0187edf559 Merge branch 'develop' into MAX-324
Conflicts:
	query_classifier/query_classifier.cc
2015-01-14 04:56:58 +02:00
df2297aa6c Added missing command types that possibly receive multiple packets to tee.c. 2015-01-13 22:10:47 +02:00
b4c01cf956 Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2015-01-13 21:39:41 +02:00
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
61efbfe687 Added comment to mysql_backend.c:process_response_data 2015-01-13 09:52:54 +02:00
d194af0733 Moved result set processing functions to modutil.c from tee.c. 2015-01-13 09:45:58 +02:00
e0a460b869 Merge branch 'firewall' into develop 2015-01-13 09:45:33 +02:00