Commit Graph

2356 Commits

Author SHA1 Message Date
011c932c7d Fix mistake in testing for null password; add contents with links to MaxAdmin reference guide. 2015-06-24 21:44:02 +01:00
e4bde4402b Fix problem of certain passwords (e.g. joomla1) being treated incorrectly as null MXS-202. 2015-06-24 21:06:56 +01:00
7a8c307515 MXS-171: https://mariadb.atlassian.net/browse/MXS-171
Added option which allows the master server to be used for reads.
2015-06-24 19:23:43 +03:00
cb67ef4e14 Merge branch 'dev-mdb10' into develop 2015-06-24 17:44:02 +03:00
577371d038 Moved SSL spinlock initialization to be done after thread initialization. 2015-06-24 16:56:27 +03:00
ced5c67338 Tidy the lining up of a message; add documentation. 2015-06-24 14:39:13 +01:00
047985fb91 Fixed SSL thread locking functions not being used. 2015-06-24 15:26:35 +03:00
80d130ef0c Fixed dcb_write_SSL being called multiple times on failure. 2015-06-24 15:05:04 +03:00
484781a463 More error logging for SSL connections. 2015-06-24 14:46:46 +03:00
067a62b240 Added more error logging to dcb_write_SSL. 2015-06-24 14:34:46 +03:00
0f199d924f Removed unnecessary call to SSL_get_error from dcb_accept_SSL. 2015-06-24 12:56:22 +03:00
13fb88ea07 Added optional code for older OpenSSL library versions. 2015-06-24 11:29:43 +03:00
dfbb42ead9 Fix missing newlines on persistent start time; fix typos. 2015-06-23 15:45:10 +01:00
da987e895a Merge branch 'MXS-212' into develop 2015-06-23 17:11:23 +03:00
c42d3d9f7a Added missing NULL checks. 2015-06-23 17:05:31 +03:00
09fdb0a2c2 Hopefully final tidy up. 2015-06-23 14:58:53 +01:00
039cbff181 Added missing null checks. 2015-06-23 16:45:10 +03:00
3f60cc4c6e Merge branch 'develop' into dev-mdb10 2015-06-23 16:21:09 +03:00
abf39303d7 Fixed the wrong value being returned form dcb_read_SSL. 2015-06-23 16:20:26 +03:00
3d7b050f6f Removed unnecessary NULL checks in mysql_client and mysql_common 2015-06-23 11:53:29 +03:00
3de7798fac Added missing session state changes. 2015-06-23 11:49:27 +03:00
2cfc93838e Merge branch 'develop' into MXS-212 2015-06-23 11:27:57 +03:00
dc43a7d9da Removed unnecessary code from dcb_close and dcb_set_state_nomutex. 2015-06-23 11:25:59 +03:00
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
71664f162b Merge branch 'develop' into dev-mdb10 2015-06-22 19:27:34 +03:00
15e6d6f9fc fix for missing crc check in blr_slave_fake_rotate()
fix for missing crc check in blr_slave_fake_rotate()
2015-06-22 18:24:39 +02:00
2d9c9425c5 Merge branch 'binlog_router_mariadb10' into dev-mdb10
Conflicts:
	server/core/config.c
2015-06-22 19:16:38 +03: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
8c900e73de removed extra blr_file_add_magic
removed extra blr_file_add_magic
2015-06-22 10:46:00 +02:00
c3aa5beeb4 Added missing initialization from MM monitor. 2015-06-21 19:32:19 +03:00
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
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
b1c657c2eb Add another debug output; fix bug; clarify variable names. 2015-06-19 20:51:22 +01:00
033080e11e Fix bugs 2015-06-19 15:31:34 +01:00
ef428b9229 Added debug messages for persistent connections; additional information via maxadmin re persistent connections. 2015-06-19 15:01:57 +01:00
f6369a1661 Changed from server unique name to ip:port in monitor script initiaion. 2015-06-18 18:03:55 +03:00
acd649cdc4 Reverted back to older OpenSSL functions for compatibility support. 2015-06-17 18:18:40 +03:00
4417f2bbf4 Moved atomic to its own static library. 2015-06-17 16:50:15 +03:00
425dd8cb3b Removed SSLv2 methods from serviceInitSSL because OpenSSL 1.1.0 does not support them. 2015-06-17 10:24:02 +03:00
f0aed1f666 Fixed possible null pointer dereferences in mysql_backend. 2015-06-17 10:05:56 +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
97a06e4006 Updated function documentation. 2015-06-16 14:24:38 +03:00
2ea7ff61a2 Fixed init.d and systemd scripts. 2015-06-16 14:20:53 +03:00
9b0a5f1328 Added more comments. 2015-06-15 16:16:48 +03:00
d6f4699912 Tidy up. 2015-06-15 11:47:18 +01:00
c2d69850de Merge branch 'develop' into schemarouter_refresh 2015-06-15 08:48:13 +03:00
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
f602121459 Added configurable SSL certificate verification depth and updated the documentation in the code. 2015-06-12 21:21:06 +03:00
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