|  | 880adca73e | Merge branch 'develop' into MAX-324 | 2015-03-05 10:45:48 +02:00 |  | 
			
				
					|  | 1b0fd4576a | Merge branch 'maxinfo' into develop Conflicts:
	server/core/service.c
	server/core/session.c
	server/include/session.h | 2015-03-04 11:33:00 +02:00 |  | 
			
				
					|  | 3b29e1a1f0 | Fixed merging conflicts. | 2015-02-24 06:34:22 +02:00 |  | 
			
				
					|  | 9e7afeb302 | Merge branch 'develop' into MAX-324 Conflicts:
	macros.cmake
	server/core/config.c
	server/core/service.c
	server/modules/routing/CMakeLists.txt | 2015-02-24 06:26:55 +02:00 |  | 
			
				
					|  | 5477cdf5eb | Renamed the dbshard module to schemarouter. | 2015-02-24 05:49:38 +02:00 |  | 
			
				
					|  | 2c401788ee | Fix to bug 579: http://bugs.mariadb.com/show_bug.cgi?id=579 Added actual testing routers and protocols. | 2015-02-20 12:30:55 +02:00 |  | 
			
				
					|  | 8e941f7523 | Addition of the MaxInfo filter and the generic MaxScale resultset | 2015-02-18 17:25:13 +00:00 |  | 
			
				
					|  | 8791cc455e | Added the initial implementation of the shardrouter module. | 2015-01-23 06:40:30 +02:00 |  | 
			
				
					|  | e6fca9b50d | Added a simple test for dbshard router. The test sets a session variable and queries a union of this variable and a value in each of the databases. | 2014-12-17 14:06:34 +02:00 |  | 
			
				
					|  | bc104c0ef1 | Merge branch 'release-1.0GA' into MAX-324 | 2014-12-08 22:37:15 +02:00 |  | 
			
				
					|  | a0cebae0ec | Make building the binlog router conditional | 2014-12-05 11:43:06 +00:00 |  | 
			
				
					|  | 36aea7454f | Updates for new logging definitions | 2014-12-04 16:56:33 +00:00 |  | 
			
				
					|  | 66164aa664 | Added functions that query backend servers for database names | 2014-12-01 14:27:33 +02:00 |  | 
			
				
					|  | 37fa9668a9 | Added a check for MySQL client libraries for the connection tests and re-enabled the tests. | 2014-11-10 09:06:23 +02:00 |  | 
			
				
					|  | 5490954e43 | Disabled login tests. | 2014-11-07 18:47:41 +02:00 |  | 
			
				
					|  | 813529b476 | Added a test for the time it takes to login through MaxScale with various routers. | 2014-11-07 17:05:21 +02:00 |  | 
			
				
					|  | 5bef5d8f53 | Removed binlogrouter from the build process. | 2014-09-25 21:25:46 +03:00 |  | 
			
				
					|  | 3f0de666ac | Changed the order of linking to resolve some debug build bugs and added the missing parent directory of the MYSQL_DIR into the included directories. | 2014-09-20 19:44:30 +03:00 |  | 
			
				
					|  | 1f56db310d | Changed variable names to closer match their usage Changed the default values to the same as in makefiles
Added configured versions of maxscale.conf and maxscale init.d script | 2014-09-15 14:12:55 +03:00 |  | 
			
				
					|  | b3ce971020 | initial implementation of the CMake build system | 2014-09-11 18:24:41 +03:00 |  |