1207 Commits

Author SHA1 Message Date
counterpoint
cc24777a90 Correct mkdir logic for default log directory. 2015-07-01 09:46:01 +01:00
Markus Makela
a2e31d6846 Changed the service resource hashing function into a proper string hashing function. 2015-06-30 21:59:09 +03:00
Markus Makela
0062d9d2b7 Version errors for SHOW SLAVE STATUS now only print once. 2015-06-29 10:24:16 +03:00
Markus Makela
88940c0097 Fixed wildcard grants not being added to the users table. 2015-06-27 09:47:06 +03:00
Markus Makela
4759df9f87 Added proper wildcard database grant detection. 2015-06-27 09:08:20 +03:00
counterpoint
03503a8f9b Fix a number of relatively simple bugs shown by Coverity. 2015-06-26 17:31:58 +01:00
Markus Makela
cff01cad05 Fixed compile errors with old SSL library. 2015-06-25 17:13:10 +03:00
Markus Makela
80709ce039 Fixed compile errors for older SSL libraries. 2015-06-25 16:46:26 +03:00
Markus Makela
61bee570d1 Fixed build failures due to old OpenSSL libraries. 2015-06-25 11:56:27 +03:00
Markus Makela
e5d9abbdcb Fixes to Coverity defects. 2015-06-25 06:01:33 +03:00
Markus Makela
cb67ef4e14 Merge branch 'dev-mdb10' into develop 2015-06-24 17:44:02 +03:00
Markus Makela
577371d038 Moved SSL spinlock initialization to be done after thread initialization. 2015-06-24 16:56:27 +03:00
counterpoint
ced5c67338 Tidy the lining up of a message; add documentation. 2015-06-24 14:39:13 +01:00
Markus Makela
047985fb91 Fixed SSL thread locking functions not being used. 2015-06-24 15:26:35 +03:00
Markus Makela
80d130ef0c Fixed dcb_write_SSL being called multiple times on failure. 2015-06-24 15:05:04 +03:00
Markus Makela
484781a463 More error logging for SSL connections. 2015-06-24 14:46:46 +03:00
Markus Makela
067a62b240 Added more error logging to dcb_write_SSL. 2015-06-24 14:34:46 +03:00
Markus Makela
0f199d924f Removed unnecessary call to SSL_get_error from dcb_accept_SSL. 2015-06-24 12:56:22 +03:00
Markus Makela
13fb88ea07 Added optional code for older OpenSSL library versions. 2015-06-24 11:29:43 +03:00
counterpoint
dfbb42ead9 Fix missing newlines on persistent start time; fix typos. 2015-06-23 15:45:10 +01:00
Markus Makela
da987e895a Merge branch 'MXS-212' into develop 2015-06-23 17:11:23 +03:00
Markus Makela
c42d3d9f7a Added missing NULL checks. 2015-06-23 17:05:31 +03:00
counterpoint
09fdb0a2c2 Hopefully final tidy up. 2015-06-23 14:58:53 +01:00
Markus Makela
039cbff181 Added missing null checks. 2015-06-23 16:45:10 +03:00
Markus Makela
3f60cc4c6e Merge branch 'develop' into dev-mdb10 2015-06-23 16:21:09 +03:00
Markus Makela
abf39303d7 Fixed the wrong value being returned form dcb_read_SSL. 2015-06-23 16:20:26 +03:00
Markus Makela
3de7798fac Added missing session state changes. 2015-06-23 11:49:27 +03:00
Markus Makela
dc43a7d9da Removed unnecessary code from dcb_close and dcb_set_state_nomutex. 2015-06-23 11:25:59 +03:00
Markus Makela
c22c6ea46a ServiceStop only removed DCBs from the polling system
This removes the need to establish new DCBs for each of the listeners while still blocking new session creation
for a service which is shut down. The client will not receive an error and the connection will be accepted
when the service is restarted.
2015-06-23 09:15:06 +03: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
Markus Makela
e14b29baf9 Fix to MXS-212: https://mariadb.atlassian.net/browse/MXS-212
The listener DCB is now properly closed instead of just being removed from the poll set.
2015-06-21 12:51:54 +03: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
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
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
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
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
68d5054afe dcb_alloc now explicitly sets the server and service pointers to NULL. 2015-06-11 21:00:07 +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