191 Commits

Author SHA1 Message Date
Johan Wikman
834a88aeda Log variables moved to log_manager.h
The log manager variables lm_enabled_log_files_bitmask, log_ses_count
and tls_log_info that earlier were declared separately in every
c-file are now declared in the log_manager.h header.
2015-11-04 14:26:53 +02:00
Markus Makela
d57b4cd531 Fix to MXS-54: https://mariadb.atlassian.net/browse/MXS-54
Added a new configuration parameter that allows the user to control
whether authentication warning messages are logged.
2015-11-04 09:18:20 +02:00
Markus Makela
0d8faa6840 Invalid thread argument now results in shutdown.
This is done to avoid situations where the loaded configuration doesn't
match the contents of maxscale.cnf.
2015-11-02 12:00:08 +02:00
Markus Makela
529e697eaf Updated code based on review of ac308dcb2c34e081f9814ad40c0961a217c86fc4
Removed unnecessary spinlock and added more checks.
2015-11-02 12:00:08 +02:00
Markus Makela
6810ed15dd Fix to MXS-436: https://mariadb.atlassian.net/browse/MXS-436
Added autodetection of processor cores and used it as the default if an
invalid value is used for threads.
2015-11-02 12:00:08 +02:00
Johan Wikman
1f22e2854b maxscale_getline moved to config.c
As a general purpose function should be somewhere else, but we
need to sort out what should be where first.
2015-10-30 09:38:40 +02:00
Markus Makela
8d6c583a1c Added a check for duplicate sections in the configuration file. 2015-10-29 16:11:08 +02:00
Markus Makela
897907b202 Fix to MXS-352: https://mariadb.atlassian.net/browse/MXS-352
If a service fails, MaxScale will try to start it again later on.
2015-10-07 15:35:12 +03:00
Markus Makela
bff6db96a1 Same database on more than one server now cause the schemarouter session to be closed. 2015-10-05 10:20:58 +03:00
Markus Makela
638c2250c9 Fixed internal test suite. 2015-09-29 16:36:12 +03:00
Markus Makela
5350a85e2b Fix to MXS-356: https://mariadb.atlassian.net/browse/MXS-356
Added configurable timeouts for the embedded MySQL connections.
2015-09-08 11:23:35 +03:00
Markus Makela
a9fd7926ac Removed unnecessary strcmp. 2015-09-04 19:34:18 +03:00
Markus Makela
9a3510ab56 Added maxinfo and binlogrouter to the list of "internal routers". 2015-09-04 19:30:14 +03:00
Markus Makela
b66dfaa8ec Fixed possible error with multi-line parameters. 2015-09-01 21:22:47 +03:00
Markus Makela
77a49e8cbd Removed magic numbers. 2015-09-01 14:31:35 +03:00
Markus Makela
386fa78a30 Fix to MXS-342: https://mariadb.atlassian.net/browse/MXS-342
Added more error messaging when the parsing of the configuration file fails.
2015-09-01 14:31:35 +03:00
Markus Makela
9d9b7bccfc Changed to PCRE for processing configuration file parameters. 2015-09-01 14:06:14 +03:00
Markus Makela
e0f95de606 Added commas to multi-line parameters without one. 2015-09-01 14:06:14 +03:00
Markus Makela
50d1675c7b Moved to realloc instead of always allocating new memory. 2015-09-01 14:06:14 +03:00
Markus Makela
de643df067 All configuration parameters now support multi-line style. 2015-09-01 14:06:14 +03:00
Markus Makela
72097fc30e Added support for multiline options for routers and filters. 2015-09-01 14:06:14 +03:00
Markus Makela
45227c8875 Changed service permission checks to fail when user doesn't have access rights. 2015-08-28 17:39:45 +03:00
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