| 
						
					 | 
					
						
						
							
						
						ce879b65c2
					 | 
					
						
						
							
							Fix wrong debug message; add maxadmin info for actual max size of persistent pool.
						
						
						
						
						
						
					 | 
					
						2015-07-08 16:03:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ba417ef633
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/develop' into MXS-122
						
						
						
						
						
						
						
						Conflicts:
	server/core/dcb.c 
						
						
					 | 
					
						2015-07-08 14:54:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fffd8fb73a
					 | 
					
						
						
							
							Unify DCB close processing to single function dcb_close. Remove dcb_add_to_zombieslist (incorporating logic into dcb_close). Alter logic so that DCB that is just allocated will still go to zombie list if dcb->fd is not closed.
						
						
						
						
						
						
					 | 
					
						2015-07-07 16:57:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						18a95eeb71
					 | 
					
						
						
							
							Simplify adding and removing DCBs from polling, improve error handling. Remove dcb_set_state functions as not adding value.
						
						
						
						
						
						
					 | 
					
						2015-07-07 16:57:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a72f462e2d
					 | 
					
						
						
							
							Fixes for MXS-196 and other related problems.
						
						
						
						
						
						
					 | 
					
						2015-07-07 16:57:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0062d9d2b7
					 | 
					
						
						
							
							Version errors for SHOW SLAVE STATUS now only print once.
						
						
						
						
						
						
					 | 
					
						2015-06-29 10:24:16 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						80709ce039
					 | 
					
						
						
							
							Fixed compile errors for older SSL libraries.
						
						
						
						
						
						
					 | 
					
						2015-06-25 16:46:26 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						09fdb0a2c2
					 | 
					
						
						
							
							Hopefully final tidy up.
						
						
						
						
						
						
					 | 
					
						2015-06-23 14:58:53 +01: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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						425dd8cb3b
					 | 
					
						
						
							
							Removed SSLv2 methods from serviceInitSSL because OpenSSL 1.1.0 does not support them.
						
						
						
						
						
						
					 | 
					
						2015-06-17 10:24:02 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2ea7ff61a2
					 | 
					
						
						
							
							Fixed init.d and systemd scripts.
						
						
						
						
						
						
					 | 
					
						2015-06-16 14:20:53 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f602121459
					 | 
					
						
						
							
							Added configurable SSL certificate verification depth and updated the documentation in the code.
						
						
						
						
						
						
					 | 
					
						2015-06-12 21:21:06 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5936916e04
					 | 
					
						
						
							
							Merge branch 'develop' into MXS-129
						
						
						
						
						
						
					 | 
					
						2015-06-12 13:53:41 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6f0e3937eb
					 | 
					
						
						
							
							Added missing include to gwdirs.h.
						
						
						
						
						
						
					 | 
					
						2015-06-11 19:43:22 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						03470bcd70
					 | 
					
						
						
							
							Merge branch 'develop' into MXS-129
						
						
						
						
						
						
					 | 
					
						2015-06-11 10:29:57 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8ac79cf2ad
					 | 
					
						
						
							
							Fixed some hard-coded paths being used instead of CMake variable values.
						
						
						
						
						
						
					 | 
					
						2015-06-11 10:28:35 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						267e702dcd
					 | 
					
						
						
							
							Various fixes and code tidying.
						
						
						
						
						
						
					 | 
					
						2015-06-10 11:28:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ab120cb1de
					 | 
					
						
						
							
							Added Diffie-Hellman key exchange for MaxScale.
						
						
						
						
						
						
					 | 
					
						2015-06-09 17:04:51 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						152f9bbc4a
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/develop' into MXS-122
						
						
						
						
						
						
					 | 
					
						2015-06-09 13:51:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						99e9987f9b
					 | 
					
						
						
							
							Clear persistent pool DCBs when server freed.
						
						
						
						
						
						
					 | 
					
						2015-06-09 08:26:14 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e395ab1442
					 | 
					
						
						
							
							Provide explicit time checking for age of persistent DCBs.
						
						
						
						
						
						
					 | 
					
						2015-06-03 16:47:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fe2f8e70d1
					 | 
					
						
						
							
							Add CHK_SERVER capability and test in dcb_persistent_clean_count
						
						
						
						
						
						
					 | 
					
						2015-06-03 15:39:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						19ac70fc2f
					 | 
					
						
						
							
							Added unit tests for SSL.
						
						
						
						
						
						
					 | 
					
						2015-06-03 13:15:45 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						18a39e6c64
					 | 
					
						
						
							
							Addition of server_update_address/port
						
						
						
						
						
						
					 | 
					
						2015-06-03 10:24:35 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						72d14f8894
					 | 
					
						
						
							
							Addition of server_update_address/port
						
						
						
						
						
						
					 | 
					
						2015-06-03 10:15:54 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1a76fc141d
					 | 
					
						
						
							
							Add configuration capabilities for persistent connections.
						
						
						
						
						
						
					 | 
					
						2015-06-02 15:44:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						57060cafec
					 | 
					
						
						
							
							Added SSL level configuration to services.
						
						
						
						
						
						
					 | 
					
						2015-06-02 17:16:53 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fc8918b1f2
					 | 
					
						
						
							
							Added a dcb_connect_SSL function which starts a client SSL connection.
						
						
						
						
						
						
					 | 
					
						2015-06-02 09:15:08 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d7232d8b6e
					 | 
					
						
						
							
							Moved SSL structure to the DCB instead of the MySQL protocol.
						
						
						
						
						
						
						
						This allows for non-MySQL SSL connections. 
						
						
					 | 
					
						2015-06-01 20:51:26 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0f814d3e73
					 | 
					
						
						
							
							Added SSL write and read functions.
						
						
						
						
						
						
					 | 
					
						2015-05-29 13:00:37 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a572166ffd
					 | 
					
						
						
							
							Added ssl handshake to mysql_client
						
						
						
						
						
						
					 | 
					
						2015-05-28 22:19:50 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d7cd40e5a5
					 | 
					
						
						
							
							Bug fixes and improvements.
						
						
						
						
						
						
					 | 
					
						2015-05-22 15:53:54 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6f31357372
					 | 
					
						
						
							
							Initial changes for persistent connections - add some basic functionality.
						
						
						
						
						
						
					 | 
					
						2015-05-20 18:15:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a73df62ebd
					 | 
					
						
						
							
							Renamed mon_exec files to externcmd.
						
						
						
						
						
						
					 | 
					
						2015-05-18 18:34:43 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8c120ca469
					 | 
					
						
						
							
							Merge branch 'develop' into MXS-121
						
						
						
						
						
						
					 | 
					
						2015-05-18 16:05:50 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fec1e66a5c
					 | 
					
						
						
							
							Add comment for parameter, correct spelling in comment.
						
						
						
						
						
						
					 | 
					
						2015-05-12 11:53:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |