49d5409dcb 
					 
					
						
						
							
							Merge branch 'develop' into MXS-121  
						
						... 
						
						
						
						Conflicts:
	server/modules/monitor/mysql_mon.c 
						
						
					 
					
						2015-05-09 04:49:06 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5a3ed0de9b 
					 
					
						
						
							
							Moved common monitor functionality to the MONITOR type  
						
						... 
						
						
						
						Common variables, like databases, timeouts and interval, and functionality was moved to the MONITOR type.
This reduces the redundant functionality of the monitor API's functions like registerServer and setInterval. 
						
						
					 
					
						2015-05-09 04:47:17 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						3cd49ac364 
					 
					
						
						
							
							Added missing utils library link from testmodutils.  
						
						
						
						
					 
					
						2015-05-07 05:56:28 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						da6d597987 
					 
					
						
						
							
							Moved common monitor structures and definitions to a separate header and added master down script to galeramon.  
						
						
						
						
					 
					
						2015-05-07 05:56:13 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						bb074d8f94 
					 
					
						
						
							
							Removed stdout printing of useless messages from maxkeys and maxpasswd.  
						
						
						
						
					 
					
						2015-05-06 21:00:43 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						dcd0098823 
					 
					
						
						
							
							Added stdout as an option for log output with the -l or --log command line option.  
						
						
						
						
					 
					
						2015-05-06 17:33:02 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						9b4e835434 
					 
					
						
						
							
							Merge branch 'develop' of  https://github.com/mariadb-corporation/MaxScale  into develop  
						
						
						
						
					 
					
						2015-05-05 13:46:13 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						9c305d95c7 
					 
					
						
						
							
							Added a warning about multiple monitors monitoring the same servers.  
						
						
						
						
					 
					
						2015-05-05 13:45:24 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8647b30184 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/develop' into MXS-105  
						
						... 
						
						
						
						Conflicts (resolved):
	server/modules/routing/schemarouter/schemarouter.c 
						
						
					 
					
						2015-05-05 10:54:09 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						6d89e156b3 
					 
					
						
						
							
							Added a warning for bad boolean configuration values.  
						
						
						
						
					 
					
						2015-05-04 20:26:32 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						3bd03fbe09 
					 
					
						
						
							
							Merge branch 'logmanager_stdout' into develop  
						
						
						
						
					 
					
						2015-05-04 11:03:24 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d545150ceb 
					 
					
						
						
							
							Fix to MXS-70:  https://mariadb.atlassian.net/browse/MXS-70  
						
						... 
						
						
						
						Added assert information to error log. 
						
						
					 
					
						2015-05-02 05:51:25 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						360db8b235 
					 
					
						
						
							
							Changed all atoi calls to config_truth_value when they were used to generate boolean values.  
						
						
						
						
					 
					
						2015-04-30 10:58:35 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						9ce225c2cb 
					 
					
						
						
							
							Added log manager initialization flag that prints all logs to stdout.  
						
						
						
						
					 
					
						2015-04-29 11:20:40 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c035f4b8b7 
					 
					
						
						
							
							Removed current directory from the module search path.  
						
						
						
						
					 
					
						2015-04-29 07:03:05 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						bf7576a501 
					 
					
						
						
							
							Fixed memory leak in config_load  
						
						
						
						
					 
					
						2015-04-28 18:43:40 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						74b5e1ddcf 
					 
					
						
						
							
							Added fix for MariaDB 10.0 embedded server missing the 5.5.5- string from the server handshake.  
						
						
						
						
					 
					
						2015-04-28 18:31:30 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						9e0a2bfc12 
					 
					
						
						
							
							Changed relevant files to use get_cachedir() instead of using the now deprecated MAXSCALE_HOME.  
						
						
						
						
					 
					
						2015-04-27 21:55:57 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1cc6ced505 
					 
					
						
						
							
							Updated old references to MAXSCALE_HOME  
						
						
						
						
					 
					
						2015-04-27 15:06:45 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						55249193a9 
					 
					
						
						
							
							Updated post-install scripts and binlogrouter  
						
						... 
						
						
						
						Binlogrouter: Switched hard-coded maximum path values to PATH_MAX and used cache directory instead of MAXSCALE_HOME
Scripts: Updated with new executable file paths 
						
						
					 
					
						2015-04-27 14:47:26 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						bbcecc0db5 
					 
					
						
						
							
							Changed all MaxScale.cnf code references to maxscale.cnf  
						
						
						
						
					 
					
						2015-04-27 13:44:36 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						0cfcad55da 
					 
					
						
						
							
							Moved get_libdir function to its own file.  
						
						
						
						
					 
					
						2015-04-27 11:06:11 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2fce114483 
					 
					
						
						
							
							Added missing buffer.c from fullcore static lib.  
						
						
						
						
					 
					
						2015-04-27 10:18:43 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						6f1fe003a3 
					 
					
						
						
							
							Added missing buffer.c from fullcore static lib.  
						
						
						
						
					 
					
						2015-04-27 10:17:55 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						97653e98fa 
					 
					
						
						
							
							Fixed a typo in the core CMakeLists.txt  
						
						
						
						
					 
					
						2015-04-27 10:16:01 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						61ebb0fe97 
					 
					
						
						
							
							Fixed a typo in the core CMakeLists.txt  
						
						
						
						
					 
					
						2015-04-27 10:14:47 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d5682bf7c0 
					 
					
						
						
							
							Removed file globbing in the core CMake file and used explicit names instead.  
						
						
						
						
					 
					
						2015-04-27 10:14:14 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5974935f65 
					 
					
						
						
							
							Removed file globbing in the core CMake file and used explicit names instead.  
						
						
						
						
					 
					
						2015-04-27 10:11:30 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						41ddc6fbfd 
					 
					
						
						
							
							Switched over to gwbuf_clone_portion in modutils_get_complete_packets.  
						
						... 
						
						
						
						Conflicts:
	server/core/modutil.c 
						
						
					 
					
						2015-04-27 09:45:11 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						af7567d405 
					 
					
						
						
							
							Switched over to gwbuf_clone_portion in modutils_get_complete_packets.  
						
						
						
						
					 
					
						2015-04-27 09:43:22 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						16044f5201 
					 
					
						
						
							
							Added optional jemalloc linkage.  
						
						
						
						
					 
					
						2015-04-27 05:57:44 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						49907ffdea 
					 
					
						
						
							
							Added optional jemalloc linkage.  
						
						
						
						
					 
					
						2015-04-27 05:57:16 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c500d23d04 
					 
					
						
						
							
							Moved default file search paths to gwdirs.h which is configured by CMake from gwdirs.h.in.  
						
						
						
						
					 
					
						2015-04-27 04:48:50 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						17a7b2addb 
					 
					
						
						
							
							Updated more variables.  
						
						
						
						
					 
					
						2015-04-26 20:08:27 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ed426ca30d 
					 
					
						
						
							
							Updated packaging install layout, moved some cmake files around.  
						
						
						
						
					 
					
						2015-04-26 06:35:36 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						df9bc65430 
					 
					
						
						
							
							Added variables that are used when installing instead of relative paths.  
						
						
						
						
					 
					
						2015-04-25 18:35:47 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						eec053924c 
					 
					
						
						
							
							Updated various MaxScale command line and configuration options to allow custom log, module, data, cache and language directories.  
						
						
						
						
					 
					
						2015-04-24 22:11:49 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c9e2632bb8 
					 
					
						
						
							
							Revert "MXS-117:  https://mariadb.atlassian.net/browse/MXS-117 "  
						
						... 
						
						
						
						This reverts commit c89c7047053f0d6f89069d1b6da2f9caa856066b. 
						
						
					 
					
						2015-04-24 17:57:41 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						fdca25db9f 
					 
					
						
						
							
							Revert "modutil_get_complete_packets now partially clones the buffer instead of allocating a new one."  
						
						... 
						
						
						
						This reverts commit b62f7f942bde10ea7d69d933c03513e315891d02. 
						
						
					 
					
						2015-04-24 17:57:00 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						62ebf542d5 
					 
					
						
						
							
							Revert "Changed PID file to /data instead of /log"  
						
						... 
						
						
						
						This reverts commit 45c3b453ec54ae93f82cc3bd53294fc25aced4ee. 
						
						
					 
					
						2015-04-24 17:56:59 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						45c3b453ec 
					 
					
						
						
							
							Changed PID file to /data instead of /log  
						
						
						
						
					 
					
						2015-04-24 17:47:30 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8b7158afda 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/develop' into MXS-105  
						
						
						
						
					 
					
						2015-04-24 15:40:07 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						03badb9b7b 
					 
					
						
						
							
							Modifications to galera monitor to control whether selection of master is wanted.  
						
						
						
						
					 
					
						2015-04-24 15:35:10 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b62f7f942b 
					 
					
						
						
							
							modutil_get_complete_packets now partially clones the buffer instead of allocating a new one.  
						
						
						
						
					 
					
						2015-04-24 17:20:20 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c89c704705 
					 
					
						
						
							
							MXS-117:  https://mariadb.atlassian.net/browse/MXS-117  
						
						... 
						
						
						
						Added command line and configuration file options for controlling the log directory. The default log directory is now /var/log/maxscale/. 
						
						
					 
					
						2015-04-24 17:15:28 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f5c168973c 
					 
					
						
						
							
							Added warning about missing monitor_interval parameter  
						
						
						
						
					 
					
						2015-04-22 22:34:02 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8bc004db26 
					 
					
						
						
							
							Merge pull request  #77  from tanji/MXS-95  
						
						... 
						
						
						
						Galera monitor improvement (MXS-95) 
						
						
					 
					
						2015-04-21 04:38:30 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b2cfa674b9 
					 
					
						
						
							
							Added support for tcmalloc usage.  
						
						
						
						
					 
					
						2015-04-20 17:52:50 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						060ebc3880 
					 
					
						
						
							
							Add support for Galera xtrabackup donor availability  
						
						
						
						
					 
					
						2015-04-20 14:45:03 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						3cb7466fea 
					 
					
						
						
							
							Fixed modutil_count_statements not igoring trailing whitespace.  
						
						
						
						
					 
					
						2015-04-20 09:25:52 +03:00