| 
						
					 | 
					
						
						
							
						
						1de8f5ffdc
					 | 
					
						
						
							
							MXS-1703: Compile mariadbmon.h as C++
						
						
						
						
						
						
					 | 
					
						2018-03-07 13:25:29 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						35232d8ad8
					 | 
					
						
						
							
							MXS-1703: Use dedicated header in NDBClusterMon
						
						
						
						
						
						
						
						NDBClusterMonitor used the MariaDBMonitor header instead of its own. 
						
						
					 | 
					
						2018-03-07 13:24:45 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ff9024bdfb
					 | 
					
						
						
							
							MXS-1698: Remove false debug assertion
						
						
						
						
						
						
						
						It is not an error if the correct GTID is not found and thus it should not
be asserted that one is found. 
						
						
					 | 
					
						2018-03-07 11:55:46 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						39d3c42c94
					 | 
					
						
						
							
							Merge branch '2.1' into 2.2
						
						
						
						
						
						
					 | 
					
						2018-03-01 17:52:42 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b67ab83486
					 | 
					
						
						
							
							Revert "Use dedicated header in NDBClusterMon"
						
						
						
						
						
						
						
						This reverts commit b9d80f6061d6b536d7a15febf0367e5f6dba0e84. 
						
						
					 | 
					
						2018-02-24 15:43:15 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0bbf0246f9
					 | 
					
						
						
							
							Revert "Compile mariadbmon.h as C++"
						
						
						
						
						
						
						
						This reverts commit 60d57aee61d96832aeec1b8a61d36803c38ca77c. 
						
						
					 | 
					
						2018-02-24 15:40:21 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						236e906d88
					 | 
					
						
						
							
							Revert "Turn MariaDB Monitor struct to class with public fields"
						
						
						
						
						
						
						
						This reverts commit cb6f70119d9857b277306e9af5881fe29c574a32. 
						
						
					 | 
					
						2018-02-24 15:37:50 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						13661ab4a6
					 | 
					
						
						
							
							Revert "MariaDB Monitor: Move additional classes to separate file"
						
						
						
						
						
						
						
						This reverts commit ff55106610881d55db88eca9e2ef6a056cbc8d51. 
						
						
					 | 
					
						2018-02-24 15:35:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e721733434
					 | 
					
						
						
							
							Revert "MariaDBMon: Move replication manipulation functions to a separate file"
						
						
						
						
						
						
						
						This reverts commit 8cdd23dda2add6486abb685834def94c72a09b6c. 
						
						
					 | 
					
						2018-02-24 15:35:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8cdd23dda2
					 | 
					
						
						
							
							MariaDBMon: Move replication manipulation functions to a separate file
						
						
						
						
						
						
						
						Refactoring continues. This update moves some of the replication manipulation
functions to a separate file and turns them into class methods. 
						
						
					 | 
					
						2018-02-22 10:51:52 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ff55106610
					 | 
					
						
						
							
							MariaDB Monitor: Move additional classes to separate file
						
						
						
						
						
						
						
						Also use stl containers in monitor definition. 
						
						
					 | 
					
						2018-02-21 12:24:24 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cb6f70119d
					 | 
					
						
						
							
							Turn MariaDB Monitor struct to class with public fields
						
						
						
						
						
						
						
						Allows using std::string for strings. Also, cleanup. 
						
						
					 | 
					
						2018-02-21 11:00:42 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						60d57aee61
					 | 
					
						
						
							
							Compile mariadbmon.h as C++
						
						
						
						
						
						
					 | 
					
						2018-02-20 11:14:21 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b9d80f6061
					 | 
					
						
						
							
							Use dedicated header in NDBClusterMon
						
						
						
						
						
						
						
						NDBClusterMonitor used the MariaDBMonitor header instead of its own. 
						
						
					 | 
					
						2018-02-20 11:09:04 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						754d80da75
					 | 
					
						
						
							
							Do not auto_rejoin if maxscale is passive
						
						
						
						
						
						
					 | 
					
						2018-02-14 17:30:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3b2ec4ab5a
					 | 
					
						
						
							
							Change references from MySQL to MariaDB
						
						
						
						
						
						
						
						A few were missed when the renaming was done. Also renamed the file to
mariadbmon.cc. 
						
						
					 | 
					
						2018-02-14 14:47:03 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |