| 
						
					 | 
					
						
						
							
						
						4f568fce85
					 | 
					
						
						
							
							Merge branch 'develop' into 1.2.1-binlog_router_trx
						
						
						
						
						
						
					 | 
					
						2015-08-19 10:00:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4e5968ee15
					 | 
					
						
						
							
							Reverted changed which add a return value to dcb_log_write_failure
						
						
						
						
						
						
					 | 
					
						2015-08-18 13:12:59 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						98ab399e6e
					 | 
					
						
						
							
							Changed sprintf calls to snprintf calls and fixed compiler warnings.
						
						
						
						
						
						
					 | 
					
						2015-08-18 10:50:48 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e65e2b3a84
					 | 
					
						
						
							
							Merge branch 'develop' into 1.2.1-binlog_router_trx
						
						
						
						
						
						
					 | 
					
						2015-08-17 12:12:16 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b26b3eff6b
					 | 
					
						
						
							
							Fixed possible NULL pointer dereference and out-of-bounds read in user hashtable comparison function.
						
						
						
						
						
						
					 | 
					
						2015-08-17 07:23:24 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						86ad570af8
					 | 
					
						
						
							
							Fix to MXS-310: https://mariadb.atlassian.net/browse/MXS-310
						
						
						
						
						
						
						
						The dumpable flag is now reset to true after the uid is changed. 
						
						
					 | 
					
						2015-08-16 18:15:16 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5743888494
					 | 
					
						
						
							
							Merge branch 'develop' into 1.2.1-binlog_router_trx
						
						
						
						
						
						
					 | 
					
						2015-08-12 09:35:01 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d6b587ad59
					 | 
					
						
						
							
							Fixed bad directory names in config not causing MaxScale to exit.
						
						
						
						
						
						
					 | 
					
						2015-08-11 21:07:11 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1989b7eaa7
					 | 
					
						
						
							
							Merge branch 'develop' into 1.2.1-binlog_router_trx
						
						
						
						
						
						
					 | 
					
						2015-08-10 17:57:32 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						37ea3a6224
					 | 
					
						
						
							
							Fixed error on bad log directory.
						
						
						
						
						
						
					 | 
					
						2015-08-10 18:25:46 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0abcf349ff
					 | 
					
						
						
							
							Partial merge of MXS-70
						
						
						
						
						
						
					 | 
					
						2015-08-10 17:33:40 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						53f24fb53a
					 | 
					
						
						
							
							Merge branch 'develop' into 1.2.1-binlog_router_trx
						
						
						
						
						
						
					 | 
					
						2015-08-10 09:55:45 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bcb44ed70d
					 | 
					
						
						
							
							Fixed PID file name.
						
						
						
						
						
						
					 | 
					
						2015-08-10 10:34:22 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9f9b63485a
					 | 
					
						
						
							
							Merge branch 'develop' into 1.2.1-binlog_router_trx
						
						
						
						
						
						
					 | 
					
						2015-08-07 21:20:32 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						710cfbd6c5
					 | 
					
						
						
							
							Fixed custom directory locations not working.
						
						
						
						
						
						
					 | 
					
						2015-08-07 19:22:26 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0239fb0650
					 | 
					
						
						
							
							Merge branch 'develop' into 1.2.1-binlog_router_trx
						
						
						
						
						
						
					 | 
					
						2015-08-07 14:48:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ba32596603
					 | 
					
						
						
							
							Fixed MM monitor segfault on crash.
						
						
						
						
						
						
					 | 
					
						2015-08-07 14:00:55 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						61c47375d5
					 | 
					
						
						
							
							Merge branch 'develop' into 1.2.1-binlog_router
						
						
						
						
						
						
						
						Conflicts:
	server/core/server.c
	server/include/server.h
	server/modules/include/blr.h
	server/modules/routing/binlog/blr.c
	server/modules/routing/binlog/blr_file.c
	server/modules/routing/binlog/blr_master.c
	server/modules/routing/binlog/blr_slave.c 
						
						
					 | 
					
						2015-08-04 07:59:44 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a6ae1cbc22
					 | 
					
						
						
							
							Fixed session timeouts using func.hangup instead of dcb_close.
						
						
						
						
						
						
					 | 
					
						2015-08-03 08:34:25 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6a92a419ff
					 | 
					
						
						
							
							Remove function declaration - moved to header. Implement spin_reporter in server.c, required for correct compilation when SPINLOCK_PROFILE is defined true.
						
						
						
						
						
						
					 | 
					
						2015-07-27 09:01:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						66445c838b
					 | 
					
						
						
							
							Fixed missing include
						
						
						
						
						
						
					 | 
					
						2015-07-24 16:48:45 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e5502271ae
					 | 
					
						
						
							
							Merge branch 'sigchld_handler' into develop
						
						
						
						
						
						
					 | 
					
						2015-07-24 13:42:52 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e252402edf
					 | 
					
						
						
							
							Fixed config failure when listener only has a socket and no port.
						
						
						
						
						
						
					 | 
					
						2015-07-24 12:47:28 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						adee076242
					 | 
					
						
						
							
							Merge branch 'develop' into sigchld_handler
						
						
						
						
						
						
					 | 
					
						2015-07-24 12:25:26 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dcd82d3a33
					 | 
					
						
						
							
							Fixed errors and added logging.
						
						
						
						
						
						
					 | 
					
						2015-07-24 12:19:22 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						90b20a7459
					 | 
					
						
						
							
							Converted dcb_free calls to dcb_close in service.c.
						
						
						
						
						
						
					 | 
					
						2015-07-24 12:06:30 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						998ef6c949
					 | 
					
						
						
							
							Added SIGCHLD handler.
						
						
						
						
						
						
					 | 
					
						2015-07-24 12:05:09 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7363343499
					 | 
					
						
						
							
							Fixed dcb_write failing when the cause was EAGAIN or EWOULDBLOCK.
						
						
						
						
						
						
					 | 
					
						2015-07-22 15:34:51 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						78e046c9f8
					 | 
					
						
						
							
							Fix typo; fix double count decrement.
						
						
						
						
						
						
					 | 
					
						2015-07-21 11:00:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c33f1199d9
					 | 
					
						
						
							
							Fix lack of declaration for session_unlink_dcb; restructure dcb closedown logic to fix counting problem and reduce code.
						
						
						
						
						
						
					 | 
					
						2015-07-21 09:54:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3c999cef8d
					 | 
					
						
						
							
							Added missing subtraction of current number of connections.
						
						
						
						
						
						
					 | 
					
						2015-07-20 16:39:37 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a53c91c587
					 | 
					
						
						
							
							Fixed compiler warnings.
						
						
						
						
						
						
					 | 
					
						2015-07-20 16:29:36 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						89524b1427
					 | 
					
						
						
							
							Further tidying in dcb_write
						
						
						
						
						
						
					 | 
					
						2015-07-20 14:19:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bb1f26eda5
					 | 
					
						
						
							
							Fixes for maintainability of dcb.c; error in persistent connections.
						
						
						
						
						
						
					 | 
					
						2015-07-19 16:48:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4a0925f33d
					 | 
					
						
						
							
							Correct mistake in dcb_read; use larger integer to accomodate three byte length in modutil.
						
						
						
						
						
						
					 | 
					
						2015-07-19 09:10:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a85262171f
					 | 
					
						
						
							
							Added missing assignment of the write buffer to write queue when a write fails in dcb_write.
						
						
						
						
						
						
					 | 
					
						2015-07-16 21:47:42 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d4bc710d3e
					 | 
					
						
						
							
							Fix mistake in dcb_close.
						
						
						
						
						
						
					 | 
					
						2015-07-15 15:15:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0a43b9eebf
					 | 
					
						
						
							
							Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop
						
						
						
						
						
						
					 | 
					
						2015-07-15 15:00:35 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b756690123
					 | 
					
						
						
							
							Merge branch 'release-1.2' into develop
						
						
						
						
						
						
					 | 
					
						2015-07-15 11:38:27 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						260f829046
					 | 
					
						
						
							
							Add blank line to start of Document Contents (link otherwise not rendered correctly by web site); move upgrade documents into their own directory; modify poll.c to fix problem relating to cloned DCBs.
						
						
						
						
						
						
					 | 
					
						2015-07-15 08:35:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						78eab19c62
					 | 
					
						
						
							
							Fixed compiler warnings.
						
						
						
						
						
						
					 | 
					
						2015-07-14 17:13:09 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3992f262ca
					 | 
					
						
						
							
							Fixed Coverity defects
						
						
						
						
						
						
					 | 
					
						2015-07-14 16:17:50 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ad369f61c6
					 | 
					
						
						
							
							Merge branch 'release-1.2' into MXS-230
						
						
						
						
						
						
					 | 
					
						2015-07-14 13:10:57 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a1801237a8
					 | 
					
						
						
							
							Fixed error messages being printed for existing directories.
						
						
						
						
						
						
					 | 
					
						2015-07-13 19:35:38 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9480c01b96
					 | 
					
						
						
							
							New log messages for dbusers loading failure
						
						
						
						
						
						
						
						New log messages for dbusers loading failure 
						
						
					 | 
					
						2015-07-13 18:12:34 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3ddbe47f8b
					 | 
					
						
						
							
							Minor tidy up, including removing obsolete MUTEX_BLOCK.
						
						
						
						
						
						
					 | 
					
						2015-07-13 14:32:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0134fdc397
					 | 
					
						
						
							
							Merge branch 'release-1.2' into develop
						
						
						
						
						
						
						
						Conflicts:
	server/core/dbusers.c 
						
						
					 | 
					
						2015-07-13 15:52:36 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						93e557d8be
					 | 
					
						
						
							
							Merge branch 'release-1.2' into MXS-230
						
						
						
						
						
						
					 | 
					
						2015-07-13 13:27:11 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						584ad321ff
					 | 
					
						
						
							
							Fixed possible crash.
						
						
						
						
						
						
					 | 
					
						2015-07-13 13:22:19 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ef6728344e
					 | 
					
						
						
							
							Fixed failures to close cloned DCBs.
						
						
						
						
						
						
					 | 
					
						2015-07-13 13:11:43 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |