Commit Graph

2238 Commits

Author SHA1 Message Date
a2768955e7 SSL handshake now successfully completes when a client connects with SSL enabled. 2015-06-01 13:50:22 +03:00
0f814d3e73 Added SSL write and read functions. 2015-05-29 13:00:37 +03:00
f946a44620 Added handling of partial SSL handshakes. 2015-05-28 23:11:32 +03:00
a572166ffd Added ssl handshake to mysql_client 2015-05-28 22:19:50 +03:00
449c186a66 Added OpenSSL init function call. 2015-05-28 18:14:00 +03:00
3d6259cb00 Added configuration options for different SSL modes. 2015-05-28 16:33:51 +03:00
16d6bd6d2c Added service SSL mode variables. 2015-05-28 11:56:14 +03:00
4365a04d2c Added 5.5.5- string to the start of MariaDB 10.0 version strings. 2015-05-28 10:30:21 +03:00
e5b4984a12 Fix bugs. 2015-05-27 16:56:53 +01:00
23e9a7b4e2 Try out some more changes. 2015-05-27 16:41:06 +01:00
6c5e6a5959 Move code around to fix headers problem etc. 2015-05-27 10:17:35 +01:00
351f52b8e1 Add "show persistent {server}" 2015-05-27 09:57:18 +01:00
06bece82a8 Fixed multi-character wildcard database grants not working with schemarouter. 2015-05-26 23:08:29 +03:00
8964e76f84 Improve messages 2015-05-26 17:03:13 +01:00
d90ea82aaa Try different code, continue polling while not in use. 2015-05-26 16:31:52 +01:00
44fc324329 Fix bugs 2015-05-26 14:59:26 +01:00
fccb9df817 Add more status information to maxadmin displays 2015-05-26 14:54:32 +01:00
4cbcc4ecb6 Removed old unused cmake variables, updated documentation and fixed testall suite. 2015-05-26 15:12:29 +03:00
5f076b81d4 Merge branch 'install_dir_change' into develop
Conflicts:
	CMakeLists.txt
	Documentation/Tutorials/Administration-Tutorial.md
	log_manager/CMakeLists.txt
	server/core/CMakeLists.txt
	server/core/gateway.c
	server/core/maxkeys.c
	server/core/maxpasswd.c
	server/modules/filter/test/CMakeLists.txt
	server/modules/routing/CMakeLists.txt
2015-05-26 13:34:39 +03:00
1e700ea85b Fix bugs 2015-05-26 11:32:13 +01:00
9d1b48da57 Move persistent from dcb_close to dcb_add_to_zombieslist 2015-05-26 11:25:10 +01:00
d7cd40e5a5 Bug fixes and improvements. 2015-05-22 15:53:54 +01:00
b51c5f52ef Fix problems in knowing user for persistent connections. 2015-05-22 14:23:14 +01:00
462bfe677b Fix some bugs; add info for maxadmin. 2015-05-22 11:17:17 +01:00
0d85ae6603 Changed data directory to /var/lib/maxscale. 2015-05-22 11:31:22 +03:00
9c461450e2 Fixes to Coverity defects. 2015-05-22 05:36:58 +03:00
9f024b5389 Added missing parenthesis. 2015-05-21 18:08:45 +03:00
ac55f7c6fe Merge branch 'MXS-121' into develop 2015-05-21 17:53:01 +03:00
3301ffc76d Added different log message when the script is missing for a monitor. 2015-05-21 17:40:33 +03:00
229cdb73e7 Fixed concurrency issues in filters. 2015-05-21 15:30:52 +03:00
91bc7b2792 Added missing spinlock calls to all monitors. 2015-05-21 11:41:11 +03:00
6f31357372 Initial changes for persistent connections - add some basic functionality. 2015-05-20 18:15:11 +01:00
7dbc021149 Added more logging when a monitor script cannot be executed. 2015-05-20 16:16:49 +03:00
4eddec7989 Fixed MXS - 165: Concurrency issue while incrementing sessions in
qlafilter
2015-05-20 17:47:58 +05:30
b815a79628 Fixed failing execvp calls leaving a process running. 2015-05-20 13:06:08 +03:00
8f20d23d4c Added missing function prototype to mmmon.c 2015-05-19 19:20:59 +03:00
a1270ef447 Added new monitor parameters to config.c 2015-05-19 16:30:01 +03:00
7c7b322e1b Added missing default monitor interval. 2015-05-19 16:20:04 +03:00
c4f51c0b8c Fixed a possible bug with multiple monitors monitoring the same servers. 2015-05-19 15:42:11 +03:00
1403b3dfeb Fixed old header names form monitor_common.h 2015-05-19 14:40:24 +03:00
d8f055858f Removed plainroute from the CMakeLists.txt. 2015-05-19 14:22:54 +03:00
a73df62ebd Renamed mon_exec files to externcmd. 2015-05-18 18:34:43 +03:00
68c5dedeec Removed plainrouter from MXS-121 branch. 2015-05-18 16:29:14 +03:00
8c120ca469 Merge branch 'develop' into MXS-121 2015-05-18 16:05:50 +03:00
a6701ee786 Added missing newline to usage output. 2015-05-14 15:42:49 +03:00
1edf7a32cc Added missing strip_db_esc to dbusers.c 2015-05-14 13:43:23 +03:00
b94f494d80 Added filtering of monitor events. 2015-05-14 12:05:58 +03:00
7d3c8673ec Added unique_name to new server when reloading config
Added unique_name to new server when reloading config
2015-05-14 11:02:45 +02:00
c2e881f544 Merge pull request #82 from yhager/MXS-137
MXS-137: correct calculation of query length when length is >= 0x80
2015-05-13 11:12:44 +03:00
efef7def6d Added test case for MXS-137: https://mariadb.atlassian.net/browse/MXS-137 2015-05-13 10:55:57 +03:00