| 
						
					 | 
					
						
						
							
						
						ba417ef633
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/develop' into MXS-122
						
						
						
						
						
						
						
						Conflicts:
	server/core/dcb.c 
						
						
					 | 
					
						2015-07-08 14:54:22 +01: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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1af73b7061
					 | 
					
						
						
							
							Fixed common sharding functions referring to schemarouter.
						
						
						
						
						
						
					 | 
					
						2015-07-06 18:12:08 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1eb907ad38
					 | 
					
						
						
							
							Fixed common sharding functions referring to schemarouter.
						
						
						
						
						
						
					 | 
					
						2015-07-03 17:08:32 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5f076b81d4
					 | 
					
						
						
							
							Merge branch 'install_dir_change' into develop
						
						
						
						
						
						
						
						Conflicts:
	CMakeLists.txt
	Documentation/Tutorials/Administration-Tutorial.md
	log_manager/CMakeLists.txt
	server/core/CMakeLists.txt
	server/core/gateway.c
	server/core/maxkeys.c
	server/core/maxpasswd.c
	server/modules/filter/test/CMakeLists.txt
	server/modules/routing/CMakeLists.txt 
						
						
					 | 
					
						2015-05-26 13:34:39 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8301410c79
					 | 
					
						
						
							
							Fixed possible memory leaks in schemarouter.
						
						
						
						
						
						
					 | 
					
						2015-05-11 22:02:35 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						463cd4a97e
					 | 
					
						
						
							
							Moved common sharding functions to a separate file.
						
						
						
						
						
						
					 | 
					
						2015-05-04 07:06:24 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						550b130d91
					 | 
					
						
						
							
							Schemarouter shortest session statistic now only updates session with a length of more than zero seconds.
						
						
						
						
						
						
					 | 
					
						2015-05-01 11:13:43 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2498278582
					 | 
					
						
						
							
							Fixed queued queries not being freed if session was closed before they could be routed.
						
						
						
						
						
						
					 | 
					
						2015-04-30 22:22:26 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fbfbc9fda7
					 | 
					
						
						
							
							Added more statistics to schemarouter diagnostics.
						
						
						
						
						
						
					 | 
					
						2015-04-23 21:00:52 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d1551be54f
					 | 
					
						
						
							
							Added support for disabling the saving of the session command history for the schemarouter.
						
						
						
						
						
						
					 | 
					
						2015-04-23 19:35:41 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						811c13fe32
					 | 
					
						
						
							
							Added more statistics to the schemarouter.
						
						
						
						
						
						
					 | 
					
						2015-04-23 06:04:09 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6f870bd74c
					 | 
					
						
						
							
							Added maximum session command amount for schemarouter.
						
						
						
						
						
						
					 | 
					
						2015-04-22 20:58:52 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						060f68892d
					 | 
					
						
						
							
							Fixed a memory leak in schemarouter.
						
						
						
						
						
						
					 | 
					
						2015-04-20 13:26:16 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1b3af7d61f
					 | 
					
						
						
							
							Fixes to Coverity defects.
						
						
						
						
						
						
					 | 
					
						2015-04-16 19:41:49 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						04a4adeb8a
					 | 
					
						
						
							
							Added ordering of the output of SHOW DATABASES for schemarouter.
						
						
						
						
						
						
					 | 
					
						2015-04-15 21:37:16 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						253c63e958
					 | 
					
						
						
							
							Fixed schemarouter not handling show databases queries spanning multiple buffers.
						
						
						
						
						
						
					 | 
					
						2015-04-14 18:50:19 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e13ab6689d
					 | 
					
						
						
							
							Fixed coverity defects.
						
						
						
						
						
						
					 | 
					
						2015-04-03 07:56:45 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						440a6ece59
					 | 
					
						
						
							
							Fix to MXS-78: https://mariadb.atlassian.net/browse/MXS-78
						
						
						
						
						
						
						
						Literal USE statements are now parsed and classified as a database change queries. 
						
						
					 | 
					
						2015-04-02 08:16:45 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ee2bb2be07
					 | 
					
						
						
							
							Added log message about 'auth_all_users' being now the default for schemarouter.
						
						
						
						
						
						
					 | 
					
						2015-04-01 18:46:59 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f2dbbe4a97
					 | 
					
						
						
							
							Added more schemarouter tests.
						
						
						
						
						
						
					 | 
					
						2015-04-01 15:23:23 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						de88ae790d
					 | 
					
						
						
							
							Fix to MXS-80: https://mariadb.atlassian.net/browse/MXS-80
						
						
						
						
						
						
						
						Fixed a possible null pointer dereference and schemarouter client sessions not being closed properly when connecting with an empty database. 
						
						
					 | 
					
						2015-04-01 11:18:11 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						04a87acced
					 | 
					
						
						
							
							Fix to MXS-79: https://mariadb.atlassian.net/browse/MXS-79
						
						
						
						
						
						
						
						Added a check for empty database. 
						
						
					 | 
					
						2015-04-01 10:53:30 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						be968cfad2
					 | 
					
						
						
							
							Fixed missing subservices parameter in config.
						
						
						
						
						
						
					 | 
					
						2015-03-31 12:54:52 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e42f171564
					 | 
					
						
						
							
							Added support for direct connections to shardrouter.
						
						
						
						
						
						
					 | 
					
						2015-03-30 20:45:05 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5f422a96fc
					 | 
					
						
						
							
							Fixed a memory leak in schemarouter.
						
						
						
						
						
						
					 | 
					
						2015-03-30 14:24:17 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5c68782050
					 | 
					
						
						
							
							Added more trace logging to readcounnroute, schemarouter and tee.
						
						
						
						
						
						
					 | 
					
						2015-03-24 21:28:03 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6b8ffe7506
					 | 
					
						
						
							
							Fixed subselects not working without explicit table names.
						
						
						
						
						
						
					 | 
					
						2015-03-24 10:07:49 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						163e598f8a
					 | 
					
						
						
							
							Added error logging to schemarouter about cross-database queries.
						
						
						
						
						
						
					 | 
					
						2015-03-19 22:18:20 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6fdc7339f9
					 | 
					
						
						
							
							More logging information for schemarouter about router state.
						
						
						
						
						
						
					 | 
					
						2015-03-13 06:06:34 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						57fc4696f2
					 | 
					
						
						
							
							Fixed missing session lock in schemarouter.
						
						
						
						
						
						
					 | 
					
						2015-03-13 03:33:37 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5fa4e3299b
					 | 
					
						
						
							
							Fixed schemarouter not storing queries received before database mapping was done.
						
						
						
						
						
						
					 | 
					
						2015-03-12 20:03:49 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fbedad84af
					 | 
					
						
						
							
							Fixes to Coverity defects.
						
						
						
						
						
						
					 | 
					
						2015-03-10 17:08:04 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5471d35524
					 | 
					
						
						
							
							Merge branch 'develop' into MAX-324
						
						
						
						
						
						
						
						Conflicts:
	server/include/modutil.h 
						
						
					 | 
					
						2015-03-09 10:18:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6766c0b883
					 | 
					
						
						
							
							Added statistics to backend references.
						
						
						
						
						
						
					 | 
					
						2015-03-06 17:41:39 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8cfd368e6b
					 | 
					
						
						
							
							Added more diagnostic output.
						
						
						
						
						
						
					 | 
					
						2015-03-06 17:06:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d98dd6e15f
					 | 
					
						
						
							
							Fixing errors caused by the merge with develop.
						
						
						
						
						
						
					 | 
					
						2015-03-05 11:14:12 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						561952e1ea
					 | 
					
						
						
							
							Moved service definition to router_options for shardrouter.
						
						
						
						
						
						
					 | 
					
						2015-02-26 20:34:35 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5477cdf5eb
					 | 
					
						
						
							
							Renamed the dbshard module to schemarouter.
						
						
						
						
						
						
					 | 
					
						2015-02-24 05:49:38 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |