Commit Graph

2422 Commits

Author SHA1 Message Date
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
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
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
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
2b4e6bb594 Merge branch 'develop' into firewall
Conflicts:
	server/modules/filter/test/CMakeLists.txt
2015-01-13 07:48:43 +02:00
c7362cec23 Update to bug 685 fix: http://bugs.mariadb.com/show_bug.cgi?id=685
Fixed results sets not being processed as a set of multiple packets.
2015-01-12 18:52:59 +02:00
333f79f4db Commented session id logging. 2015-01-12 14:44:53 +02:00
36178e6c63 Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2015-01-12 14:26:05 +02:00
6be227f3c4 Added comments, removed non-existing function, cleaned up a bit. 2015-01-12 14:25:37 +02:00
ec9f575a6e Fix to bug 690: http://bugs.mariadb.com/show_bug.cgi?id=690
Updated the debian/rules file to use mysql_config instead of a hard-coded path.
2015-01-12 11:12:51 +02:00
ee2876e9a4 Added parameter NULL checks to query_classifier.cc 2015-01-10 21:29:29 +02:00
4c20ed4c11 Merge branch 'bug_685_fix' into develop 2015-01-09 19:43:49 +02:00
759b0c2ccb Fix to bug 685: http://bugs.mariadb.com/show_bug.cgi?id=685
Tee filter now supports longer packets and only sends the last GWBUF if both the parent and the child session have send all their bytes.
2015-01-09 19:38:50 +02:00
8572a08cab Merge branch 'master' into develop 2015-01-09 11:23:03 +02:00
39c2c818e0 set version to 1.0.5-unstable 2015-01-09 10:51:22 +02:00
4ee6251872 resolving conflicts 2015-01-09 10:34:56 +02:00
8ce9cd1cbd Fix to wrong version string being used in the macros.cmake . 2015-01-09 05:10:05 +02:00
f90b8bdc88 Fixed hint filter tests failing because the testing configuration was not using all the available slaves for testing resulting in unexpected routing decisions. 2015-01-08 21:13:33 +02:00
7987365bd4 Fix to tee filter tests failing due to the default user not being found in the etc/passwd file. 2015-01-08 20:21:56 +02:00
c8fbe71527 change version number to 1.0.4-stable 2015-01-08 17:51:08 +02:00