f06eec13f6 
					 
					
						
						
							
							Merge branch 'develop' into 1.2.1-binlog_router_trx  
						
						
						
						
					 
					
						2015-11-17 09:50:25 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						82dc3ff3c5 
					 
					
						
						
							
							Update lastReply with heartbeat event  
						
						... 
						
						
						
						Update lastReply when heartbeat event is seen and a transaction is
still open 
						
						
					 
					
						2015-11-17 09:47:21 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						a90b336cc4 
					 
					
						
						
							
							blr_master_reconnect instead of blr_start_master  
						
						... 
						
						
						
						blr_master_reconnect instead of blr_start_master in
blr_stop_start_master 
						
						
					 
					
						2015-11-16 15:55:08 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						a355e1beef 
					 
					
						
						
							
							Printf format checking added to logging function.  
						
						... 
						
						
						
						Printf format checking added to logging function and all
issues that were revealed by that fixed. 
						
						
					 
					
						2015-11-16 12:40:49 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						00c506b029 
					 
					
						
						
							
							Fix for rotate and catchup with transaction_safety = 1  
						
						... 
						
						
						
						Fix for rotate and catchup with transaction_safety = 1 
						
						
					 
					
						2015-11-06 18:14:52 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						834a88aeda 
					 
					
						
						
							
							Log variables moved to log_manager.h  
						
						... 
						
						
						
						The log manager variables lm_enabled_log_files_bitmask, log_ses_count
and tls_log_info that earlier were declared separately in every
c-file are now declared in the log_manager.h header. 
						
						
					 
					
						2015-11-04 14:26:53 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8208f3a728 
					 
					
						
						
							
							strerror_r update  
						
						... 
						
						
						
						strerror_r update 
						
						
					 
					
						2015-10-23 18:44:39 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						3be5238bd7 
					 
					
						
						
							
							Fixed indentation.  
						
						
						
						
					 
					
						2015-10-23 15:05:51 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						63f4bc3aec 
					 
					
						
						
							
							Changed from router->binlog_lock to router->lock for transaction safety code and cleaned up code.  
						
						
						
						
					 
					
						2015-10-23 14:54:08 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						40ffe21dd8 
					 
					
						
						
							
							Added a variable for current event being processed after a transaction is committed.  
						
						
						
						
					 
					
						2015-10-23 12:33:51 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1e76de540f 
					 
					
						
						
							
							Added blr_distribute_error_message when distributing transaction events  
						
						... 
						
						
						
						Added blr_distribute_error_message when distributing transaction events 
						
						
					 
					
						2015-10-02 09:46:52 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d31e081e45 
					 
					
						
						
							
							Changed log messages for blr_read_binlog, added slave send error feaure  
						
						... 
						
						
						
						Changed log messages for blr_read_binlog, added slave send error feaure.
When blr_read_binlog detects an error an error message with 1236 code
is sent to the slave and it will stop the replication to binlogrouter 
						
						
					 
					
						2015-10-01 17:03:48 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						680589ed46 
					 
					
						
						
							
							Slave heartbeat period is reported in diagnostics  
						
						... 
						
						
						
						Slave heartbeat period is reported in diagnostics only if router option
is set 
						
						
					 
					
						2015-09-30 15:21:18 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f9ee9ca028 
					 
					
						
						
							
							Addition of send_slave_heartbeat option  
						
						... 
						
						
						
						Addition of send_slave_heartbeat option 
						
						
					 
					
						2015-09-30 14:39:26 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b6df52a68e 
					 
					
						
						
							
							Addition of slave heartbeat check  
						
						... 
						
						
						
						Addition of slave heartbeat check 
						
						
					 
					
						2015-09-25 15:58:36 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						89748d9b21 
					 
					
						
						
							
							Binlog identity log message update  
						
						... 
						
						
						
						Binlog identity log message update 
						
						
					 
					
						2015-09-18 11:18:32 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						81e186fd92 
					 
					
						
						
							
							server-id reported as server_id in binlog_identity log  
						
						... 
						
						
						
						server-id reported as server_id in binlog_identity log 
						
						
					 
					
						2015-09-18 10:09:11 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						3822cae9c2 
					 
					
						
						
							
							blr_log_identity() moved to the right location  
						
						... 
						
						
						
						blr_log_identity() moved to the right location 
						
						
					 
					
						2015-09-16 17:28:32 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e4677fbd44 
					 
					
						
						
							
							Log message fix  
						
						... 
						
						
						
						Log message fix 
						
						
					 
					
						2015-09-16 17:16:20 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						faaf33918d 
					 
					
						
						
							
							Binlog Identity is logged with MESSAGE  
						
						... 
						
						
						
						Binlog Identity is logged with MESSAGE 
						
						
					 
					
						2015-09-16 15:44:50 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						fac4b3ff11 
					 
					
						
						
							
							Fix for MariaDB 10  
						
						... 
						
						
						
						Fix for MariaDB 10 
						
						
					 
					
						2015-09-15 19:10:23 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c12233db0d 
					 
					
						
						
							
							Small fixes  
						
						... 
						
						
						
						Small fixes 
						
						
					 
					
						2015-09-15 16:50:15 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						abf5b6d02a 
					 
					
						
						
							
							Addition of status variable output formatting  
						
						... 
						
						
						
						Addition of status variable output formatting and router options check
and check for mandatory server_id parameter
Logging of binlog router identy seen by master and slaves 
						
						
					 
					
						2015-09-15 15:13:05 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						9cd9a6183b 
					 
					
						
						
							
							Merge branch 'develop' into 1.2.1-binlog_router_trx  
						
						
						
						
					 
					
						2015-09-14 21:13:14 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2829a8ce05 
					 
					
						
						
							
							Added missing check for empty result set in binlogrouter.  
						
						
						
						
					 
					
						2015-09-14 21:20:22 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f60254f626 
					 
					
						
						
							
							Added MariaDB 10 transaction detection  
						
						... 
						
						
						
						Added MariaDB 10 transaction detection 
						
						
					 
					
						2015-08-26 17:32:45 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5153c16eac 
					 
					
						
						
							
							Added BLRM_MASTER_REGITRATION_QUERY_LEN constant  
						
						... 
						
						
						
						Added BLRM_MASTER_REGITRATION_QUERY_LEN constant 
						
						
					 
					
						2015-08-25 11:27:15 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						3fe0c074c5 
					 
					
						
						
							
							Added strerror_r and new constants  
						
						... 
						
						
						
						Added strerror_r and new constants 
						
						
					 
					
						2015-08-24 15:02:22 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						6aa4a31c2e 
					 
					
						
						
							
							Removed unused var  
						
						... 
						
						
						
						Removed unused var 
						
						
					 
					
						2015-08-24 10:56:33 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						799844e243 
					 
					
						
						
							
							Fixed MXS-111  https://mariadb.atlassian.net/browse/MXS-111  
						
						... 
						
						
						
						Fixed MXS-111 https://mariadb.atlassian.net/browse/MXS-111  
						
						
					 
					
						2015-08-24 10:52:26 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						6b456c5346 
					 
					
						
						
							
							Removed duplicated statements  
						
						... 
						
						
						
						Removed duplicated statements 
						
						
					 
					
						2015-08-24 10:49:00 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						4242d28e13 
					 
					
						
						
							
							Added support for new options  
						
						... 
						
						
						
						Added support for new options:
master_uuid,  master_hostname, master_version
If set, those values will be sent to slaves instead of
saved master responses 
						
						
					 
					
						2015-08-21 16:31:40 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						53c35b05ab 
					 
					
						
						
							
							Added default heartbeat set via define and blr_last_event_description  
						
						... 
						
						
						
						Added default heartbeat set via define and blr_last_event_description() 
						
						
					 
					
						2015-08-17 14:05:41 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						37fd6f54e9 
					 
					
						
						
							
							Added blr_check_heartbeat as task  
						
						... 
						
						
						
						Added blr_check_heartbeat as task 
						
						
					 
					
						2015-08-17 12:29:59 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1f1671a0e2 
					 
					
						
						
							
							Version upate  
						
						... 
						
						
						
						Version upate 
						
						
					 
					
						2015-08-12 11:18:04 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						9bada09d2d 
					 
					
						
						
							
							Update messages on errors  
						
						... 
						
						
						
						Update messages on errors 
						
						
					 
					
						2015-08-09 23:14:55 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						343cb49f8c 
					 
					
						
						
							
							fprintf removed  
						
						... 
						
						
						
						fprintf removed 
						
						
					 
					
						2015-08-07 17:19:49 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						479e4e3203 
					 
					
						
						
							
							Added blr_check_binlog at router startup if trx_safe is set  
						
						... 
						
						
						
						Added blr_check_binlog at router startup if trx_safe is set 
						
						
					 
					
						2015-08-07 11:59:15 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e5a2e5cd1f 
					 
					
						
						
							
							Improvements added in stop/start slave and change master  
						
						... 
						
						
						
						Improvements added in stop/start slave and change master 
						
						
					 
					
						2015-08-06 17:47:37 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f91a339674 
					 
					
						
						
							
							Initial implementation of transaction safety  
						
						... 
						
						
						
						Initial implementation of transaction safety 
						
						
					 
					
						2015-08-05 14:29:17 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						619261cd21 
					 
					
						
						
							
							Small improvements  
						
						... 
						
						
						
						Small improvements 
						
						
					 
					
						2015-08-04 16:39:03 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						02496d7410 
					 
					
						
						
							
							Fixed error message in createInstance  
						
						... 
						
						
						
						Fixed error message in createInstance 
						
						
					 
					
						2015-08-04 15:47:41 +02: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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						9ef43c9d9e 
					 
					
						
						
							
							Logged statement is truncated if contains 'password'  
						
						... 
						
						
						
						Logged statement is truncated if contains 'password' 
						
						
					 
					
						2015-07-28 13:25:14 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8d7def654a 
					 
					
						
						
							
							Merge part of MXS-289 bug  
						
						... 
						
						
						
						Merge part of MXS-289 bug 
						
						
					 
					
						2015-07-28 12:47:21 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						556e99b2a9 
					 
					
						
						
							
							Fix for bug MXS-289  
						
						... 
						
						
						
						Added fix for bug MXS-289 
						
						
					 
					
						2015-07-27 18:44:05 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						aa6294f1f2 
					 
					
						
						
							
							Fixed binlogrouter not working with C99 flags.  
						
						
						
						
					 
					
						2015-07-20 08:59:35 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						7b9d54d1d4 
					 
					
						
						
							
							Removed MASTER_PASSWORD from logs  
						
						... 
						
						
						
						Removed MASTER_PASSWORD from logs 
						
						
					 
					
						2015-07-14 17:32:42 +02: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