f44a3cf758
Updated 1.2 release notes.
2015-06-23 20:10:43 +03:00
29492426c3
Updated documentation contents.
2015-06-23 20:06:02 +03:00
77c085fbd3
Improved routing hint documentation.
2015-06-23 19:51:19 +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
53812dc5d3
Remove include of atomic.h to bring in line with develop
2015-06-22 10:49:07 +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
79c20bfae8
Fixed trace and debug logs not being created in shared memory.
2015-06-19 04:45:02 +03:00
0cc2c13d7e
Updated documentation.
2015-06-18 18:13:50 +03:00
f6369a1661
Changed from server unique name to ip:port in monitor script initiaion.
2015-06-18 18:03:55 +03:00
d5e94d5df6
Merge branch 'MXS-179' into develop
2015-06-18 15:11:51 +03:00
e6b16121eb
Added instructions for SSH key generation.
2015-06-18 13:49:12 +03:00
09ffeff17e
Updated lsyncd document.
2015-06-18 13:25:30 +03:00
fd42395d00
Removed mandb call from postinstall script and added cmake messages about systemd service file installation.
2015-06-18 08:17:02 +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
2d63aa2842
Fixed typo and added an example script.
2015-06-16 22:36:53 +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
2775145f37
Fixed spelling errors.
2015-06-16 12:59:48 +03:00
a562eb7cee
Merge branch 'develop' into MXS-179
...
Conflicts:
CMakeLists.txt
2015-06-15 16:44:01 +03:00
cd865f2552
Merge branch 'MXS-129' into develop
2015-06-15 16:23:34 +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