Commit Graph

410 Commits

Author SHA1 Message Date
697e108072 Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-09-03 18:58:06 +02:00
30cdda48c6 The datadir path is now used as the location where the process specific data directories are created. 2015-09-03 19:30:16 +03:00
506bc422fb Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-09-03 10:08:55 +02:00
28a6ea90c0 Added more details to log output when MaxScale receives a fatal signal. 2015-09-01 10:11:20 +03:00
a591b47b9f Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-08-28 16:09:32 +02:00
3a901bfea7 Added automatic configuration of localhost_match_wildcard_host. 2015-08-28 14:55:40 +03:00
c5214bea1b Cleaned up code and changed function structure. 2015-08-28 12:54:38 +03:00
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
4da9045da4 Removed redundant function. 2015-08-28 12:54:38 +03:00
94eb1b4eb1 Added service and monitor permission checks. 2015-08-28 12:51:37 +03:00
85d11436d7 Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-08-25 16:10:43 +02:00
b1d6096fa8 Added a check for running MaxScale processes. 2015-08-25 15:20:10 +03:00
34bd94fbcd Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-08-20 10:09:32 +02:00
139d4829a9 Further refinement of poll_remove_dcb function to ensure proper delayed release of a DCB that may be in the poll list and should only be destroyed after all threads have completed any operations on it; add comments describing implementation limitations in the bitmask processing. 2015-08-20 06:58:05 +01:00
1989b7eaa7 Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-08-10 17:57:32 +02:00
37ea3a6224 Fixed error on bad log directory. 2015-08-10 18:25:46 +03:00
0abcf349ff Partial merge of MXS-70 2015-08-10 17:33:40 +03:00
9f9b63485a Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-08-07 21:20:32 +02:00
710cfbd6c5 Fixed custom directory locations not working. 2015-08-07 19:22:26 +03:00
61c47375d5 Merge branch 'develop' into 1.2.1-binlog_router
Conflicts:
	server/core/server.c
	server/include/server.h
	server/modules/include/blr.h
	server/modules/routing/binlog/blr.c
	server/modules/routing/binlog/blr_file.c
	server/modules/routing/binlog/blr_master.c
	server/modules/routing/binlog/blr_slave.c
2015-08-04 07:59:44 -04:00
100f8ebd66 Removed unnecessary memory allocation. 2015-08-03 20:02:13 +03:00
c33f1199d9 Fix lack of declaration for session_unlink_dcb; restructure dcb closedown logic to fix counting problem and reduce code. 2015-07-21 09:54:01 +01:00
4f5de063eb Merged dcb_read and dcb_read_n into a single function (dcb_read with an extra parameter). 2015-07-10 15:12:22 +01:00
8376bbf3e6 Fix mismatch of int sizes; move calculation of maximum size of persistent pool to a better location. 2015-07-09 08:37:20 +01:00
ce879b65c2 Fix wrong debug message; add maxadmin info for actual max size of persistent pool. 2015-07-08 16:03:50 +01:00
ba417ef633 Merge remote-tracking branch 'origin/develop' into MXS-122
Conflicts:
	server/core/dcb.c
2015-07-08 14:54:22 +01:00
fffd8fb73a Unify DCB close processing to single function dcb_close. Remove dcb_add_to_zombieslist (incorporating logic into dcb_close). Alter logic so that DCB that is just allocated will still go to zombie list if dcb->fd is not closed. 2015-07-07 16:57:12 +01:00
18a95eeb71 Simplify adding and removing DCBs from polling, improve error handling. Remove dcb_set_state functions as not adding value. 2015-07-07 16:57:12 +01:00
a72f462e2d Fixes for MXS-196 and other related problems. 2015-07-07 16:57:12 +01:00
0062d9d2b7 Version errors for SHOW SLAVE STATUS now only print once. 2015-06-29 10:24:16 +03:00
80709ce039 Fixed compile errors for older SSL libraries. 2015-06-25 16:46:26 +03:00
09fdb0a2c2 Hopefully final tidy up. 2015-06-23 14:58:53 +01:00
0c98a318dd Try to get atomic.h included correctly for C++ 2015-06-22 12:13:28 +01:00
b880350cf3 Complete merge of latest develop branch 2015-06-22 10:39:13 +01:00
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
425dd8cb3b Removed SSLv2 methods from serviceInitSSL because OpenSSL 1.1.0 does not support them. 2015-06-17 10:24:02 +03:00
466ee46d82 Fix to MXS-125: https://mariadb.atlassian.net/browse/MXS-125
Unified the usages of maxkeys and maxpasswd.
2015-06-16 17:10:00 +03:00
2ea7ff61a2 Fixed init.d and systemd scripts. 2015-06-16 14:20:53 +03:00
f602121459 Added configurable SSL certificate verification depth and updated the documentation in the code. 2015-06-12 21:21:06 +03:00
5936916e04 Merge branch 'develop' into MXS-129 2015-06-12 13:53:41 +03:00
6f0e3937eb Added missing include to gwdirs.h. 2015-06-11 19:43:22 +03:00
03470bcd70 Merge branch 'develop' into MXS-129 2015-06-11 10:29:57 +03:00
8ac79cf2ad Fixed some hard-coded paths being used instead of CMake variable values. 2015-06-11 10:28:35 +03:00
267e702dcd Various fixes and code tidying. 2015-06-10 11:28:25 +01:00
de2910f75b Fixed SSL_accept failing if the GWBUF with the initial MySQL auth packet contains some of the SSL authentication data. 2015-06-09 22:27:15 +03:00
ab120cb1de Added Diffie-Hellman key exchange for MaxScale. 2015-06-09 17:04:51 +03:00
152f9bbc4a Merge remote-tracking branch 'origin/develop' into MXS-122 2015-06-09 13:51:55 +01:00
99e9987f9b Clear persistent pool DCBs when server freed. 2015-06-09 08:26:14 +01:00
e395ab1442 Provide explicit time checking for age of persistent DCBs. 2015-06-03 16:47:02 +01:00
fe2f8e70d1 Add CHK_SERVER capability and test in dcb_persistent_clean_count 2015-06-03 15:39:06 +01:00