Commit Graph

76 Commits

Author SHA1 Message Date
11c2d4dfe4 Added a rule to restrict queries during certain hours of the day 2014-10-16 14:12:00 +03:00
effe8f3297 Switched over to hashtables for users and columns. 2014-10-15 15:23:14 +03:00
104e79a591 Merge branch 'develop' into firewall 2014-10-15 05:51:08 +03:00
9ed65759a2 Changed missed references of SkySQL, Gateway and old emails and URLs to new versions. 2014-10-14 14:14:10 +03:00
9abe270da8 added checking for where clause on queries 2014-10-13 13:48:07 +03:00
75117f2482 Merge branch 'develop' into firewall
Conflicts:
	server/modules/filter/CMakeLists.txt
2014-10-12 10:13:54 +03:00
c99b7c884f Added rule for requirement of where clause on queries 2014-10-12 10:12:35 +03:00
be08f22ae1 Changed old references to SkySQL to MariaDB Corporation and Gateway to MaxScale. 2014-10-10 16:38:54 +03:00
e00dbb9beb Added missing my_config.h header to mqfilter.c 2014-10-10 13:17:12 +03:00
afc081d992 Added column, username and wildcard rules. 2014-10-10 08:50:41 +03:00
fe20df3596 Merged new query classifier tests and the filter harness
testserver.c: commented out the code that referred to undefined variables
testusers.c: changed server to user for the assert to make sense
2014-10-09 15:46:04 +03:00
8d5b985e2b Added blocking of IP ranges. 2014-10-09 15:31:44 +03:00
e02bed1f14 Initial implementation of the firewall filter. 2014-10-09 13:22:38 +03:00
b03b886c3f added independent testing of the hint filter 2014-10-06 13:24:09 +03:00
68580af95f Modifications to building 2014-10-06 10:41:56 +03:00
1adc6ac5e8 Merge remote-tracking branch 'origin/develop' into filter_harness 2014-10-06 09:43:42 +03:00
524f693991 Split the filter testing harness into two different versions, the interactive and command line tool. 2014-10-06 09:41:21 +03:00
c4ca1ddb13 Updated non-source files with new company name. 2014-10-01 15:21:47 +03:00
0acb8fe05d Renaming missed SkySQL references. 2014-10-01 13:48:00 +03:00
c344231f80 Renamed all occurences of SkySQL to MariaDB Corporation 2014-09-30 13:02:10 +03:00
fc848665e5 Added variables for RabbitMQ headers and libraries, added more error checks.
modified:   CMakeLists.txt
	modified:   README
	modified:   macros.cmake
	modified:   query_classifier/test/canonical_tests/CMakeLists.txt
	modified:   rabbitmq_consumer/CMakeLists.txt
	modified:   server/modules/filter/CMakeLists.txt
2014-09-22 13:14:53 +03:00
3f0de666ac Changed the order of linking to resolve some debug build bugs and added the missing parent directory of the MYSQL_DIR into the included directories. 2014-09-20 19:44:30 +03:00
530d29f96d Merge branch 'release-1.0beta-refresh' into filter_harness 2014-09-17 11:07:12 +03:00
fdf1271138 Cleaned up RabbitMQ component building. 2014-09-16 11:34:05 +03:00
1f56db310d Changed variable names to closer match their usage
Changed the default values to the same as in makefiles
Added configured versions of maxscale.conf and maxscale init.d script
2014-09-15 14:12:55 +03:00
5d26cf6fd5 Added optional RabbitMQ component configuration
Changed all the configuration variables to cached
Fixed some errors in tests
2014-09-14 07:33:21 +03:00
b3ce971020 initial implementation of the CMake build system 2014-09-11 18:24:41 +03:00
0a468a910b Makefile modifications
Makefile modifications
2014-09-11 13:10:02 +02:00
8b5b4a17fe Merge from Z3
Merge from Z3
2014-09-11 12:51:16 +02:00
6196dfb050 fix to bug 475 2014-09-10 16:18:47 +03:00
950c30e065 Fix bug 528 - wrong service name in tee fitler crashes MaxScale 2014-09-09 08:50:15 +01:00
d77b9f4de3 server/core/test/makefile and
server/modules/filter/Makefile: Added path to libmysqld (-L<path>) so that linker finds it at compile time.
server/test/MaxScale_template.cnf: added write_ses_variables_to_all=Yes and read_ses_variables_from_slaves=Yes so that tests included in testall target succeed (at server/modules/routing/readwritesplit/test). Added hint filter to 'normal' rwsplit service.
2014-09-09 09:36:24 +03:00
f74493d922 server/modules/filter/Makefile: Fixed problem which prevented cleaning and compiling hintfilter library.
server/core/config.c: Removed unused if..else block from config_get_valint. Changed it also to return value which indicates whether the operation succeed. Added config_get_valbool similar to config_get_valint.
service.c:Added typelib-like struct and array of valid boolean values. Fixed parameter type test in service_set_param_value. Completed boolean type parameter handling.
hintparser.c:Fixed error message for non-maxscale hints.
readwritesplit.c:Added loading of configuration parameters from service to instance and from instance to each new session. Fixed routing condition in get_route_target. Modified get_route_target so that it takes also rw_read_sesvars_from_slaves and rw_write_sesvars_to_all as parameters.
skygw_types.h: added array size counting macro.
2014-09-08 21:44:23 +03:00
7b7fc74cfa RabbitMQ filter is now built by default and can be disabled with BUILD_RABBITMQ=N 2014-09-05 12:00:48 +03:00
aafc891c9a Fixed canonical query test and mqfilter.c bugs 2014-09-05 10:58:54 +03:00
a81bebbc8f Removed the mqfilter sources from the default filter build 2014-09-04 16:16:41 +03:00
d7b604bfa3 Added BUILD_RABBITMQ makefile variable to define if the mqfilter is built 2014-09-04 16:13:17 +03:00
9c7781e062 Merging rabbitmq into Z3 2014-09-04 15:01:05 +03:00
6b54927638 Z3 merge 2014-09-04 10:36:59 +03:00
4a30626974 Merge branch 'Z2' of https://github.com/skysql/MaxScale into Z2
Conflicts:
	client/Makefile
	server/core/buffer.c
	server/core/test/makefile
	server/include/buffer.h
	server/modules/filter/Makefile
	server/modules/routing/webserver.c
2014-08-29 16:21:08 +03:00
d6a2ef6996 Misc fixes to doxygen comments 2014-08-19 13:22:40 +01:00
fb87f68368 consistently use DEL instead of rm in Makefiles 2014-08-17 21:02:24 +00:00
b04dc8e4d7 documentation for the filter testing harness 2014-08-15 14:11:55 +03:00
e057268b5b filter testing harness 2014-08-11 12:13:18 +03:00
86a4c3ba90 Fix to #472, http://bugs.skysql.com/show_bug.cgi?id=472
Fix to #473, http://bugs.skysql.com/show_bug.cgi?id=473

Several memory issues. Read the code.
In general one-off hint is only added to gwbuf and freed in gwbuf_free. Stacked hint is copied to stack and to gwbuf. gwbuf is freed after routing but stacked hint is freed either in stop or when session is closed. All this applies to named hint as well except that in addition, it has one more copy in named hint struct which is emptied when session is closed.
2014-08-08 01:28:07 +03:00
0659d7abd0 Partial fix to Bug #470, http://bugs.skysql.com/show_bug.cgi?id=470.
hintparser.c:token_get_keyword: Handling for TOK_STRING was missing.
2014-08-06 18:09:06 +03:00
bcc04b840b Merge branch 'Z2' of https://github.com/skysql/MaxScale 2014-08-06 16:48:50 +03:00
b72e80b464 Fix for Bug #466, http://bugs.skysql.com/show_bug.cgi?id=466
hintparser.c:hint_parser:when string token is found, create a copy of the token value instead of copying the its address because token will be freed before the value is used.
	hint_next_token:didn't recognize '=' as TOK_EQUAL, fixed that. Read the code.
hint.c:hint_create_parameter: copy the pointer to parameter name instead of creating copy of it - pname is already copied from token before the call
readwritesplit.c:routeQuery:Hint name was copied when hint value was supposed to be copied, thus resulting invalid value for hinted parameter. Also fixed server type in trace log command.
skygw_debug.h:Added string for Relay server to macro STRSRVSTATUS.
2014-08-06 16:39:22 +03:00
d06cad1457 Documentation update
Documentation update
2014-08-06 09:33:55 +02:00
08b99c121e Bug #468, http://bugs.skysql.com/show_bug.cgi?id=468, Query classifier accessed freed thread context. If parsing fails thd doesn't need to be freed because it holds correct information about command type.
session.c:session_setup_filters : fixed memory leak
hintparser.c: added token_free for HINT_TOKENs and fixed a few memory leaks.
mysql_client_server_protocol.h: added mysql_protocol_done which frees memory blocks pointed to by protocol members. Those can't be freed in dcb.c because dcb.c doesn't know about protocol's members.
mysql_backend.c:gw_backend_close: fixed memory leak
mysql_client.c: gw_client_close: fixed memory leak
mysql_common.c: added implementation of mysql_protocol_done
        :protocol_archive_srv_command: tried to fix memory leak. Some memory is still leaking according to valgrind. Removed use of uninitialized local variable len.
readwritesplit.c: Fix to bug #469, http://bugs.skysql.com/show_bug.cgi?id=469,  rwsplit counts every connection twice in master - counnection counts leak
	execute_sescmd_in_backend: fixed a memory leak - visible only in DEBUG=Y build.
readwritesplit/test/makefile: added target for hints tests
2014-08-05 18:14:06 +03:00