3a69a87df1 
					 
					
						
						
							
							Merge branch 'rwsplit_fixes' into release-1.2  
						
						
						
						
					 
					
						2015-07-08 14:12:53 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						10d690273d 
					 
					
						
						
							
							Resolve compiler warnings  
						
						
						
						
					 
					
						2015-07-08 11:35:41 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						af2ce0f4f1 
					 
					
						
						
							
							Fix to MXS-252:  https://mariadb.atlassian.net/browse/MXS-252  
						
						... 
						
						
						
						Added missing buffer length parameter. 
						
						
					 
					
						2015-07-08 12:45:48 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						fb09cbf100 
					 
					
						
						
							
							Fixed queries being routed when the session is already closing.  
						
						
						
						
					 
					
						2015-07-07 13:15:23 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c2e51f2e98 
					 
					
						
						
							
							Fix to MXS-223:  https://mariadb.atlassian.net/browse/MXS-223  
						
						... 
						
						
						
						Added a temporary buffer to prevent losing the pointer to the cloned buffer when dcb->func.write fails. 
						
						
					 
					
						2015-07-07 08:16:29 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1af73b7061 
					 
					
						
						
							
							Fixed common sharding functions referring to schemarouter.  
						
						
						
						
					 
					
						2015-07-06 18:12:08 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						dc646bfbf1 
					 
					
						
						
							
							Fix to MXS-244:  https://mariadb.atlassian.net/browse/MXS-244  
						
						... 
						
						
						
						Fixed buffers being only partially consumed if they contained more than one packet
when a replu to a prepared statement is received. 
						
						
					 
					
						2015-07-04 09:07:37 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						a9e0a52b9e 
					 
					
						
						
							
							Fixed false positives in SHOW SHARDS detection.  
						
						
						
						
					 
					
						2015-07-03 13:59:25 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5964a68143 
					 
					
						
						
							
							Added SHOW SHARDS functionality into schemarouter.  
						
						
						
						
					 
					
						2015-07-03 13:44:22 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						993ec723b9 
					 
					
						
						
							
							Added verbose client errors to schemarouter.  
						
						
						
						
					 
					
						2015-07-02 13:28:23 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						3989e0dc6b 
					 
					
						
						
							
							Merge branch 'develop' into schemarouter_refresh  
						
						
						
						
					 
					
						2015-07-02 12:20:14 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						22f8e61321 
					 
					
						
						
							
							Fixed build failure.  
						
						
						
						
					 
					
						2015-07-01 16:47:00 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						dc15fbb576 
					 
					
						
						
							
							Fixed build failure.  
						
						
						
						
					 
					
						2015-07-01 16:46:32 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						53a4dd393d 
					 
					
						
						
							
							Fix to a Coverity defect.  
						
						
						
						
					 
					
						2015-07-01 16:08:33 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						6c61dabfab 
					 
					
						
						
							
							Fix to a Coverity defect.  
						
						
						
						
					 
					
						2015-07-01 05:15:08 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e350f19e6f 
					 
					
						
						
							
							Added NULL checks to readwritesplit.  
						
						
						
						
					 
					
						2015-06-30 21:59:09 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5165c6b981 
					 
					
						
						
							
							master.ini contains now master configuration  
						
						... 
						
						
						
						master.ini contains now master configuration
It can be created or modified by CHANGE MASTER TO
Added new BLRM_UNCONFIGURED state 
						
						
					 
					
						2015-06-30 16:10:02 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						a2e281823a 
					 
					
						
						
							
							Added NULL checks to readwritesplit.  
						
						
						
						
					 
					
						2015-06-30 14:58:36 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c6f43c0058 
					 
					
						
						
							
							Merge branch 'MXS-171' into develop  
						
						
						
						
					 
					
						2015-06-29 12:04:43 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c40818b8f7 
					 
					
						
						
							
							Merge branch 'develop' into schemarouter_refresh  
						
						
						
						
					 
					
						2015-06-27 08:29:37 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c9606e1071 
					 
					
						
						
							
							Fixed build failures due to mismatching function prototypes.  
						
						
						
						
					 
					
						2015-06-27 08:28:37 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						530011b9b8 
					 
					
						
						
							
							Merge branch 'develop' into schemarouter_refresh  
						
						
						
						
					 
					
						2015-06-27 06:33:58 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						03503a8f9b 
					 
					
						
						
							
							Fix a number of relatively simple bugs shown by Coverity.  
						
						
						
						
					 
					
						2015-06-26 17:31:58 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b526da1fd4 
					 
					
						
						
							
							Added fix in CHANGE MASTER TO when MASTER_LOG_FILE is not set  
						
						... 
						
						
						
						Added fix in CHANGE MASTER TO when MASTER_LOG_FILE is not set 
						
						
					 
					
						2015-06-26 09:52:57 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						7a8c307515 
					 
					
						
						
							
							MXS-171:  https://mariadb.atlassian.net/browse/MXS-171  
						
						... 
						
						
						
						Added option which allows the master server to be used for reads. 
						
						
					 
					
						2015-06-24 19:23:43 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						cd7f7aba57 
					 
					
						
						
							
							CHAGE MASTER TO new binlog requires MASTER_LOG_POS to be set  
						
						... 
						
						
						
						CHAGE MASTER TO new binlog requires MASTER_LOG_POS to be set 
						
						
					 
					
						2015-06-23 17:42:42 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						543873a44f 
					 
					
						
						
							
							Add default for missing MASTER_LOG_POS  
						
						... 
						
						
						
						Add default for missing MASTER_LOG_POS
4 if binlog is a new one
current pos if binlog = current one 
						
						
					 
					
						2015-06-23 17:19:54 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						09fdb0a2c2 
					 
					
						
						
							
							Hopefully final tidy up.  
						
						
						
						
					 
					
						2015-06-23 14:58:53 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						7a0a010a86 
					 
					
						
						
							
							CHANGE MASTER error messages improvement  
						
						... 
						
						
						
						CHANGE MASTER error messages improvement
New Start Slave implementation
Error Handling when master_state is BLRM_BINLOGDUMP: in case of error
master replication stops and new state is BLRM_SLAVE_STOPPED 
						
						
					 
					
						2015-06-23 15:34:56 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						022179ca12 
					 
					
						
						
							
							start slave may create a new binlog file  
						
						... 
						
						
						
						start slave may create a new binlog file 
						
						
					 
					
						2015-06-23 10:05:39 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						71664f162b 
					 
					
						
						
							
							Merge branch 'develop' into dev-mdb10  
						
						
						
						
					 
					
						2015-06-22 19:27:34 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						15e6d6f9fc 
					 
					
						
						
							
							fix for missing crc check in blr_slave_fake_rotate()  
						
						... 
						
						
						
						fix for missing crc check in blr_slave_fake_rotate() 
						
						
					 
					
						2015-06-22 18:24:39 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2816d87013 
					 
					
						
						
							
							fix for missing crc check in blr_slave_fake_rotate()  
						
						... 
						
						
						
						fix for missing crc check in blr_slave_fake_rotate()
fix for missing @@version_comment in order to allow mysql client get in 
						
						
					 
					
						2015-06-22 18:21:43 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2d9c9425c5 
					 
					
						
						
							
							Merge branch 'binlog_router_mariadb10' into dev-mdb10  
						
						... 
						
						
						
						Conflicts:
	server/core/config.c 
						
						
					 
					
						2015-06-22 19:16:38 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8c900e73de 
					 
					
						
						
							
							removed extra blr_file_add_magic  
						
						... 
						
						
						
						removed extra blr_file_add_magic 
						
						
					 
					
						2015-06-22 10:46:00 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5bc07c5100 
					 
					
						
						
							
							Added error handling in BINLOG_DUMP phase  
						
						... 
						
						
						
						Added error handling in BINLOG_DUMP phase: router goes into
BLRM_SLAVE_STOPPED state
Removed blr_file_add_magic called twice 
						
						
					 
					
						2015-06-22 10:35:02 +02: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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						64bb68c12c 
					 
					
						
						
							
							inst->master_chksum = true; is put back  
						
						... 
						
						
						
						inst->master_chksum = true; is put back 
						
						
					 
					
						2015-06-17 12:23:31 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						4952dc48bb 
					 
					
						
						
							
							Added constraints to CHANGE MASTER TO options  
						
						... 
						
						
						
						Added constraints to CHANGE MASTER TO options  MASTER_LOG_FILE and
MASTER_LOG_POS 
						
						
					 
					
						2015-06-15 15:03:27 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d94ac9c637 
					 
					
						
						
							
							Added new general error message  
						
						... 
						
						
						
						Added new general error message
Added
Slave_IO_Running: No
Slave_SQL_Running: No
when slave is stopped 
						
						
					 
					
						2015-06-09 16:46:41 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b1c383b19e 
					 
					
						
						
							
							Added database list refreshing to schemarouter.  
						
						
						
						
					 
					
						2015-06-09 16:13:06 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d0e92a15f8 
					 
					
						
						
							
							Move decrement of server connections into zombie processing; introduce dcb_close_finish to be called either in dcb_close or when persistent dcb is discarded.  
						
						
						
						
					 
					
						2015-06-09 11:41:43 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1cbc7d6e7f 
					 
					
						
						
							
							Added error string to router->m_errmsg  
						
						... 
						
						
						
						Added error string to router->m_errmsg 
						
						
					 
					
						2015-06-09 12:39:50 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f46c47651a 
					 
					
						
						
							
							Compile error, missing ';'  
						
						... 
						
						
						
						Compile error, missing ';' 
						
						
					 
					
						2015-06-09 10:33:23 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2db4f4d771 
					 
					
						
						
							
							Added error_msg to blr_slave_send_slave_status()  
						
						... 
						
						
						
						Added error_msg to blr_slave_send_slave_status() 
						
						
					 
					
						2015-06-08 19:16:50 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d9234bec5f 
					 
					
						
						
							
							Updated logging messages  
						
						... 
						
						
						
						Updated logging messages 
						
						
					 
					
						2015-06-08 17:30:26 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						809cdb5b1e 
					 
					
						
						
							
							Added blr_cache_read_master_data and dcb checks  
						
						... 
						
						
						
						Added blr_cache_read_master_data()
Added dcb checks before calling db_close
Forced initialisation values of some parameters 
						
						
					 
					
						2015-06-08 16:56:52 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						945e2f8132 
					 
					
						
						
							
							added checks in blr_stop_slave()  
						
						... 
						
						
						
						errorReply sets mysql_errno into router struct
blr_slave_send_slave_status displays mysql errno
added checks in blr_stop_slave() 
						
						
					 
					
						2015-06-05 17:37:05 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2a15e6e774 
					 
					
						
						
							
							server_update_port/address are used  
						
						... 
						
						
						
						server_update_port and server_update_address now used by
blr_handle_change_master 
						
						
					 
					
						2015-06-03 10:30:03 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						cedaeb7fe9 
					 
					
						
						
							
							MariaDB10 embedded library version string  
						
						... 
						
						
						
						MariaDB10 embedded library version string 
						
						
					 
					
						2015-06-03 09:41:12 +02:00