| 
						
					 | 
					
						
						
							
						
						f18f233de2
					 | 
					
						
						
							
							Try to resolve unexpected compiler errors
						
						
						
						
						
						
					 | 
					
						2015-08-25 09:23:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						12922225b8
					 | 
					
						
						
							
							Remove redundant DCB state DCB_STATE_FREED, remove obsolete assertion from poll.c, tidy up.
						
						
						
						
						
						
					 | 
					
						2015-08-25 09:11:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ae669c6f88
					 | 
					
						
						
							
							Fix mistake
						
						
						
						
						
						
					 | 
					
						2015-08-24 16:29:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						65c42e2d80
					 | 
					
						
						
							
							Move removal of closing DCB from poll list to the kill zombies processing, rather than immediately on close; modify persistent connections to obtain candidates for the pool from the kill zombies processing to be sure that they really are finished all previous processing.
						
						
						
						
						
						
					 | 
					
						2015-08-24 16:19:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						37ac158791
					 | 
					
						
						
							
							Changes to try to eliminate setting dcb->session to NULL with risk of crashing system.
						
						
						
						
						
						
					 | 
					
						2015-08-24 12:12:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d6f5bdc067
					 | 
					
						
						
							
							Merge branch 'develop' into 1.2.1-binlog_router_trx
						
						
						
						
						
						
					 | 
					
						2015-08-24 10:20:45 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5e2e2585ad
					 | 
					
						
						
							
							Fix mistakes.
						
						
						
						
						
						
					 | 
					
						2015-08-23 16:43:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1baf693b02
					 | 
					
						
						
							
							First changes for lazy session creation.
						
						
						
						
						
						
					 | 
					
						2015-08-23 16:39:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						087c2fca46
					 | 
					
						
						
							
							Block out new test for the time being.
						
						
						
						
						
						
					 | 
					
						2015-08-23 10:09:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6b2d90fc50
					 | 
					
						
						
							
							Add check so DCB can't be added to poll list without a linked session; small safety improvement in session; tidying.
						
						
						
						
						
						
					 | 
					
						2015-08-23 09:34:26 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						53c3cc4b41
					 | 
					
						
						
							
							Fix mistake; tidy format.
						
						
						
						
						
						
					 | 
					
						2015-08-22 19:14:40 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7410b3dfbd
					 | 
					
						
						
							
							Cleaned up code.
						
						
						
						
						
						
					 | 
					
						2015-08-21 18:13:45 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d1bf6bb303
					 | 
					
						
						
							
							Merge branch 'develop' into dcb_code_revert
						
						
						
						
						
						
					 | 
					
						2015-08-20 12:06:14 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						34bd94fbcd
					 | 
					
						
						
							
							Merge branch 'develop' into 1.2.1-binlog_router_trx
						
						
						
						
						
						
					 | 
					
						2015-08-20 10:09:32 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						139d4829a9
					 | 
					
						
						
							
							Further refinement of poll_remove_dcb function to ensure proper delayed release of a DCB that may be in the poll list and should only be destroyed after all threads have completed any operations on it; add comments describing implementation limitations in the bitmask processing.
						
						
						
						
						
						
					 | 
					
						2015-08-20 06:58:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						38f78c7239
					 | 
					
						
						
							
							Fix possible threading problem.
						
						
						
						
						
						
					 | 
					
						2015-08-19 17:23:49 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |