169 Commits

Author SHA1 Message Date
Markus Makela
c5214bea1b Cleaned up code and changed function structure. 2015-08-28 12:54:38 +03:00
Markus Makela
525daf827a Service are not started if user permissions are inadequate.
Also cleaned up code and error messages.
2015-08-28 12:54:38 +03:00
Markus Makela
4da9045da4 Removed redundant function. 2015-08-28 12:54:38 +03:00
Markus Makela
94eb1b4eb1 Added service and monitor permission checks. 2015-08-28 12:51:37 +03:00
Markus Makela
0abcf349ff Partial merge of MXS-70 2015-08-10 17:33:40 +03:00
Markus Makela
e252402edf Fixed config failure when listener only has a socket and no port. 2015-07-24 12:47:28 +03:00
Markus Makela
b756690123 Merge branch 'release-1.2' into develop 2015-07-15 11:38:27 +03:00
Markus Makela
78eab19c62 Fixed compiler warnings. 2015-07-14 17:13:09 +03:00
counterpoint
3ddbe47f8b Minor tidy up, including removing obsolete MUTEX_BLOCK. 2015-07-13 14:32:54 +01:00
counterpoint
ba417ef633 Merge remote-tracking branch 'origin/develop' into MXS-122
Conflicts:
	server/core/dcb.c
2015-07-08 14:54:22 +01:00
counterpoint
10d690273d Resolve compiler warnings 2015-07-08 11:35:41 +01:00
Markus Makela
058f49eb88 Added error message about MySQL versions lower than 5.5 and monitors without the 'mysql51_replication' enabled. 2015-07-07 20:14:57 +03:00
counterpoint
03503a8f9b Fix a number of relatively simple bugs shown by Coverity. 2015-06-26 17:31:58 +01:00
counterpoint
09fdb0a2c2 Hopefully final tidy up. 2015-06-23 14:58:53 +01:00
Markus Makela
2d9c9425c5 Merge branch 'binlog_router_mariadb10' into dev-mdb10
Conflicts:
	server/core/config.c
2015-06-22 19:16:38 +03:00
counterpoint
b880350cf3 Complete merge of latest develop branch 2015-06-22 10:39:13 +01:00
Martin Brampton
4c38e2224b Merge remote-tracking branch 'origin/develop' into MXS-122
Conflicts:
	server/core/CMakeLists.txt
	server/core/dcb.c
	server/include/dcb.h
	server/include/server.h
	server/modules/protocol/mysql_backend.c
2015-06-19 23:12:54 +01:00
Markus Makela
f602121459 Added configurable SSL certificate verification depth and updated the documentation in the code. 2015-06-12 21:21:06 +03:00
counterpoint
267e702dcd Various fixes and code tidying. 2015-06-10 11:28:25 +01:00
counterpoint
152f9bbc4a Merge remote-tracking branch 'origin/develop' into MXS-122 2015-06-09 13:51:55 +01:00
Markus Makela
19ac70fc2f Added unit tests for SSL. 2015-06-03 13:15:45 +03:00
counterpoint
6e803c647b Fix bugs, try different arrangement of dcb_close code. 2015-06-03 10:02:27 +01:00
counterpoint
1a76fc141d Add configuration capabilities for persistent connections. 2015-06-02 15:44:57 +01:00
Markus Makela
57060cafec Added SSL level configuration to services. 2015-06-02 17:16:53 +03:00
Markus Makela
94ba445d2f Added 5.5.5- string to the start of MariaDB 10.0 version strings. 2015-06-02 10:57:25 +03:00
Markus Makela
0f814d3e73 Added SSL write and read functions. 2015-05-29 13:00:37 +03:00
Markus Makela
a572166ffd Added ssl handshake to mysql_client 2015-05-28 22:19:50 +03:00
Markus Makela
3d6259cb00 Added configuration options for different SSL modes. 2015-05-28 16:33:51 +03:00
Markus Makela
16d6bd6d2c Added service SSL mode variables. 2015-05-28 11:56:14 +03:00
Markus Makela
4365a04d2c Added 5.5.5- string to the start of MariaDB 10.0 version strings. 2015-05-28 10:30:21 +03:00
Markus Makela
a1270ef447 Added new monitor parameters to config.c 2015-05-19 16:30:01 +03:00
MassimilianoPinto
7d3c8673ec Added unique_name to new server when reloading config
Added unique_name to new server when reloading config
2015-05-14 11:02:45 +02:00
Markus Makela
9b4e835434 Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2015-05-05 13:46:13 +03:00
Markus Makela
9c305d95c7 Added a warning about multiple monitors monitoring the same servers. 2015-05-05 13:45:24 +03:00
counterpoint
8647b30184 Merge remote-tracking branch 'origin/develop' into MXS-105
Conflicts (resolved):
	server/modules/routing/schemarouter/schemarouter.c
2015-05-05 10:54:09 +01:00
Markus Makela
6d89e156b3 Added a warning for bad boolean configuration values. 2015-05-04 20:26:32 +03:00
Markus Makela
360db8b235 Changed all atoi calls to config_truth_value when they were used to generate boolean values. 2015-04-30 10:58:35 +03:00
Markus Makela
bf7576a501 Fixed memory leak in config_load 2015-04-28 18:43:40 +03:00
Markus Makela
74b5e1ddcf Added fix for MariaDB 10.0 embedded server missing the 5.5.5- string from the server handshake. 2015-04-28 18:31:30 +03:00
counterpoint
8b7158afda Merge remote-tracking branch 'origin/develop' into MXS-105 2015-04-24 15:40:07 +01:00
counterpoint
03badb9b7b Modifications to galera monitor to control whether selection of master is wanted. 2015-04-24 15:35:10 +01:00
Markus Makela
f5c168973c Added warning about missing monitor_interval parameter 2015-04-22 22:34:02 +03:00
markus456
8bc004db26 Merge pull request #77 from tanji/MXS-95
Galera monitor improvement (MXS-95)
2015-04-21 04:38:30 +03:00
Guillaume Lefranc
060ebc3880 Add support for Galera xtrabackup donor availability 2015-04-20 14:45:03 +02:00
Markus Makela
4b623e3af4 Added percentage conversion functions to maxconfig.h 2015-04-16 21:51:19 +03:00
Markus Makela
1b3af7d61f Fixes to Coverity defects. 2015-04-16 19:41:49 +03:00
Markus Makela
d16e4fe134 Added an option for optimization of wildcard grants to individual grants. The default behavior now checks first for specific grants to a database the wildcard grants. 2015-04-15 06:51:52 +03:00
Markus Makela
be968cfad2 Fixed missing subservices parameter in config. 2015-03-31 12:54:52 +03:00
Markus Makela
90875c1164 Cleaned up unused variables. 2015-03-11 18:12:18 +02:00
Markus Makela
63d83cd85d Monitor API 2.0.0 implemented. 2015-03-11 15:18:55 +02:00