Commit Graph

988 Commits

Author SHA1 Message Date
3ae29eb363 Merge branch 'develop' into firewall 2014-10-16 14:13:19 +03:00
11c2d4dfe4 Added a rule to restrict queries during certain hours of the day 2014-10-16 14:12:00 +03:00
4acd85cf82 Add missing trim() call to the server list code for monitors 2014-10-15 13:26:00 +01:00
effe8f3297 Switched over to hashtables for users and columns. 2014-10-15 15:23:14 +03:00
a63e251d09 Bug 431 - replace == with = 2014-10-15 13:03:12 +01:00
0cd97ea482 Merge branch 'develop' of github.com:skysql/MaxScale into develop 2014-10-15 12:49:15 +01:00
fa278a2167 Bug 570 - memory manageing in hint parameters 2014-10-15 12:48:07 +01:00
1a59e1b188 Bug 559 - Remove password file before starting test_adminusers 2014-10-15 12:39:34 +01:00
9c49cd87b1 Fix to #571, http://bugs.mariadb.com/show_bug.cgi?id=571
In rwsplit router, merge multiple (query) buffers to one if necessary.
2014-10-15 11:25:17 +03:00
104e79a591 Merge branch 'develop' into firewall 2014-10-15 05:51:08 +03:00
25bef90508 Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2014-10-14 19:16:50 +03:00
56b82acb1b Fixed CMake builds overwriting MaxScale.cnf when installing after tests were built. 2014-10-14 19:15:59 +03:00
6707d6d0cf Complamentatry fix to that of #575.
resolve_maxscale_homedir returned always false due to succp variable which wasn't updated in successful case.
2014-10-14 18:13:04 +03:00
8f2d23444a Merge branch 'develop' into MAX-268 2014-10-14 15:40:30 +02:00
9ed65759a2 Changed missed references of SkySQL, Gateway and old emails and URLs to new versions. 2014-10-14 14:14:10 +03:00
0ae522f1bd Memory leak in getUsers()
Memory leak in getUsers() when no users are loaded due to an error
2014-10-14 12:53:31 +02:00
6237209bb2 Add tests 2014-10-14 11:47:13 +01:00
9212effb86 memory leak fixed
memory leak fixed
2014-10-14 12:46:15 +02:00
a194c47b07 Updated test_mysql_users
Updated test_mysql_users
2014-10-14 12:33:56 +02:00
726ab87f4b Fix to #575, http://bugs.mariadb.com/show_bug.cgi?id=575
log_manager.cc:
	Log manager handles cases where there are mismatch in user privileges.
	Mark log files enabled in the global lm_enabled_logfiles_bitmask after initialization so that it reflects reality in error cases. In general, take into account the possibility that any phase in initialization may fail and read return values.
	Replaced file_exists_and_is_writable to check_file_and_path which has a slightly different logic and which detects if file open fails for a few different reasons.
	Improved logging (in stderr) in general in error cases.

gateway.c: Also check home directory accessibility in case when it is provided as a command-line argument. Added function check_dir_access to provide that function. Read return value of skysql_logmanager_init and exit (nicely) if it failed.

skygw_utils.cc: initialize mlist with version number 2, which indicates that object is initialized (different than zero) and that there are no active updates on the object (version%2==0).
2014-10-14 13:22:16 +03:00
9abe270da8 added checking for where clause on queries 2014-10-13 13:48:07 +03:00
a2de3254d4 Merge branch 'develop' into MAX-268 2014-10-13 10:55:00 +02: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
34400ee551 Fixed the use of nanosleep which removed a spinloop and degraded the performance dramatically. 2014-10-10 23:53:55 +03:00
037da6915b Merge branch 'develop' into MAX-268 2014-10-10 16:37:43 +02:00
be08f22ae1 Changed old references to SkySQL to MariaDB Corporation and Gateway to MaxScale. 2014-10-10 16:38:54 +03:00
18ae3e35ef develop branch merged
develop branch merged
2014-10-10 15:30:56 +02:00
e00dbb9beb Added missing my_config.h header to mqfilter.c 2014-10-10 13:17:12 +03:00
ebb3b52fdb Included the my_config.h header before any system headers if mysql headers were used. 2014-10-10 12:30:21 +03:00
afc081d992 Added column, username and wildcard rules. 2014-10-10 08:50:41 +03:00
d16bb227e9 Completing fix to bug #565, http://bugs.mariadb.com/show_bug.cgi?id=565
Client's flags are also used when changing the user inside the session.
2014-10-09 16:37:26 +03:00
85b15cf5ce Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2014-10-09 15:54:11 +03:00
2bd93025a9 Fix to bug #558, http://bugs.mariadb.com/show_bug.cgi?id=558
Added #include <strings.h> and length indicator to strncasecmp call.
Fix to bug #513, http://bugs.mariadb.com/show_bug.cgi?id=513
Replaced usleep with nanosleep.
2014-10-09 15:51:46 +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
637d5c57b3 Merge branch 'develop' into filter_harness 2014-10-09 15:34:20 +03:00
8d5b985e2b Added blocking of IP ranges. 2014-10-09 15:31:44 +03:00
659f3bfd58 Merge pull request #57 from mariadb-corporation/MAX-311
Fix to bug # 565, http://bugs.mariadb.com/show_bug.cgi?id=565
2014-10-09 14:19:44 +03:00
e02bed1f14 Initial implementation of the firewall filter. 2014-10-09 13:22:38 +03:00
29e53e150a Fix to bug # 565, http://bugs.mariadb.com/show_bug.cgi?id=565
Client flags are now copied to each backend and used in their connections.

log_manager.cc: fixed string allocation where one byte was missing.
mysql_client.c: fixed string allocation where one byte was missing.
2014-10-08 22:27:28 +03:00
d5071267e7 More tests; minor fixes. 2014-10-08 18:04:28 +01:00
76e85dfb11 Add more tests 2014-10-08 13:33:23 +01:00
153a1cd385 Fixed the fix: invalid packet test removed. 2014-10-07 18:41:53 +03:00
93dc40bcb9 Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2014-10-07 18:25:31 +03:00
07fc5162a0 Fix to bug #562, http://bugs.mariadb.com/show_bug.cgi?id=562
mysql_client.c, added functions create_auth_fail_str, and get_username_from_auth to implement creation of similar error msg with MySQL. There is one difference left, because MaxScale prints IP address instead of hostname in error message.
2014-10-07 18:00:22 +03:00
496343c272 Add new tests 2014-10-07 15:47:21 +01:00
3cd8e29c4c Changed the way some CMake functions are used to support older versions of CMake. 2014-10-07 14:09:22 +03:00
57ad30f105 Fuller message in asserts. 2014-10-07 09:08:49 +01:00
b5188a7643 Merge branch 'develop' into filter_harness 2014-10-06 14:04:23 +03:00
b03b886c3f added independent testing of the hint filter 2014-10-06 13:24:09 +03:00