3416 Commits

Author SHA1 Message Date
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
Martin Brampton
b1c657c2eb Add another debug output; fix bug; clarify variable names. 2015-06-19 20:51:22 +01:00
counterpoint
033080e11e Fix bugs 2015-06-19 15:31:34 +01:00
counterpoint
ef428b9229 Added debug messages for persistent connections; additional information via maxadmin re persistent connections. 2015-06-19 15:01:57 +01:00
Markus Makela
79c20bfae8 Fixed trace and debug logs not being created in shared memory. 2015-06-19 04:45:02 +03:00
Markus Makela
0cc2c13d7e Updated documentation. 2015-06-18 18:13:50 +03:00
Markus Makela
f6369a1661 Changed from server unique name to ip:port in monitor script initiaion. 2015-06-18 18:03:55 +03:00
Markus Makela
d5e94d5df6 Merge branch 'MXS-179' into develop 2015-06-18 15:11:51 +03:00
Markus Makela
e6b16121eb Added instructions for SSH key generation. 2015-06-18 13:49:12 +03:00
Markus Makela
09ffeff17e Updated lsyncd document. 2015-06-18 13:25:30 +03:00
Markus Makela
fd42395d00 Removed mandb call from postinstall script and added cmake messages about systemd service file installation. 2015-06-18 08:17:02 +03:00
Markus Makela
acd649cdc4 Reverted back to older OpenSSL functions for compatibility support. 2015-06-17 18:18:40 +03:00
Markus Makela
4417f2bbf4 Moved atomic to its own static library. 2015-06-17 16:50:15 +03:00
Markus Makela
425dd8cb3b Removed SSLv2 methods from serviceInitSSL because OpenSSL 1.1.0 does not support them. 2015-06-17 10:24:02 +03:00
Markus Makela
f0aed1f666 Fixed possible null pointer dereferences in mysql_backend. 2015-06-17 10:05:56 +03:00
Markus Makela
2d63aa2842 Fixed typo and added an example script. 2015-06-16 22:36:53 +03:00
Markus Makela
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
Markus Makela
97a06e4006 Updated function documentation. 2015-06-16 14:24:38 +03:00
Markus Makela
2ea7ff61a2 Fixed init.d and systemd scripts. 2015-06-16 14:20:53 +03:00
Markus Makela
2775145f37 Fixed spelling errors. 2015-06-16 12:59:48 +03:00
Markus Makela
a562eb7cee Merge branch 'develop' into MXS-179
Conflicts:
	CMakeLists.txt
2015-06-15 16:44:01 +03:00
Markus Makela
cd865f2552 Merge branch 'MXS-129' into develop 2015-06-15 16:23:34 +03:00
Markus Makela
9b0a5f1328 Added more comments. 2015-06-15 16:16:48 +03:00
counterpoint
d6f4699912 Tidy up. 2015-06-15 11:47:18 +01:00
Martin Brampton
84d5af1e00 Throw away poll events that occur for persistent pool DCBs with no related session; fix typos. 2015-06-14 18:19:30 +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
dc21ef0165 Fix problem with persisting DCBs that have been closed by backend; try leaving persistent DCBs polling. 2015-06-12 15:27:53 +01:00
Markus Makela
5936916e04 Merge branch 'develop' into MXS-129 2015-06-12 13:53:41 +03:00
Markus Makela
d3cc9be52e Added libcurl-devel and pcre-devel to build dependencies. 2015-06-12 10:05:50 +03:00
Markus Makela
521e1aaf3b Added man page for maxscale. 2015-06-12 02:55:07 +03:00
Markus Makela
68d5054afe dcb_alloc now explicitly sets the server and service pointers to NULL. 2015-06-11 21:00:07 +03:00
Markus Makela
fe2062b5b0 Fixed a regression in mysql_mon.c which caused a memory leak 2015-06-11 19:50:51 +03:00
Markus Makela
6f0e3937eb Added missing include to gwdirs.h. 2015-06-11 19:43:22 +03:00
Markus Makela
2b2e81feb2 Fix to MXS-181: https://mariadb.atlassian.net/browse/MXS-181
Added TCP_NODELAY to socket options.
2015-06-11 19:05:05 +03:00
Markus Makela
7aa154deb4 Merge branch 'srirampatil-develop' into develop 2015-06-11 18:42:18 +03:00
Markus Makela
3d3b397a67 Merge branch 'develop' of https://github.com/srirampatil/MaxScale into srirampatil-develop
Conflicts:
	server/modules/filter/qlafilter.c
2015-06-11 18:41:56 +03:00
Markus Makela
f24da8712b Fixed a segfault and disabled syslog by default. 2015-06-11 18:25:42 +03:00
Markus Makela
1c68a9a872 Fixed dcb_connect_SSL calling SSL_connect again after a successful connection was already made. 2015-06-11 15:54:09 +03:00
Markus Makela
3f34d237ca enabled all bug fixes for OpenSSL. 2015-06-11 15:26:05 +03:00
Markus Makela
2cf92a1894 Added RSA key generator. 2015-06-11 13:22:18 +03:00
Markus Makela
bb427128a9 Fixed successful SSL_accept calls causing another call to SSL_accept. 2015-06-11 12:00:03 +03:00
Martin Brampton
420510749c Fix bug and tidy code. 2015-06-11 09:30:18 +01:00
Markus Makela
03470bcd70 Merge branch 'develop' into MXS-129 2015-06-11 10:29:57 +03:00
Markus Makela
8ac79cf2ad Fixed some hard-coded paths being used instead of CMake variable values. 2015-06-11 10:28:35 +03:00
counterpoint
466e86f057 Remove difftime, add decrement of persistent count when expired or cleaned. 2015-06-10 17:40:00 +01:00
counterpoint
50cc290bc4 Run DCB close separately from spinlocked removal from pool. 2015-06-10 15:43:43 +01:00
Markus Makela
c15469013e Fixed non-SSL connections to SSL enabled services failing. 2015-06-10 15:05:39 +03:00
counterpoint
267e702dcd Various fixes and code tidying. 2015-06-10 11:28:25 +01:00
Markus Makela
3fb1213dee Added more error logging when monitor scripts fail. 2015-06-10 06:09:42 +03:00
Markus Makela
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