Markus Makela
|
6497350ab7
|
Merge branch 'release-1.2' into develop
Conflicts:
server/core/adminusers.c
server/modules/protocol/mysql_client.c
|
2015-07-11 17:12:48 +03:00 |
|
counterpoint
|
10d690273d
|
Resolve compiler warnings
|
2015-07-08 11:35:41 +01:00 |
|
Markus Makela
|
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 |
|
counterpoint
|
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 |
|
Markus Makela
|
463cd4a97e
|
Moved common sharding functions to a separate file.
|
2015-05-04 07:06:24 +03:00 |
|
counterpoint
|
03badb9b7b
|
Modifications to galera monitor to control whether selection of master is wanted.
|
2015-04-24 15:35:10 +01:00 |
|
Markus Makela
|
1b3af7d61f
|
Fixes to Coverity defects.
|
2015-04-16 19:41:49 +03:00 |
|
Markus Makela
|
be968cfad2
|
Fixed missing subservices parameter in config.
|
2015-03-31 12:54:52 +03:00 |
|
Markus Makela
|
e42f171564
|
Added support for direct connections to shardrouter.
|
2015-03-30 20:45:05 +03:00 |
|
Markus Makela
|
fbedad84af
|
Fixes to Coverity defects.
|
2015-03-10 17:08:04 +02:00 |
|
Markus Makela
|
5471d35524
|
Merge branch 'develop' into MAX-324
Conflicts:
server/include/modutil.h
|
2015-03-09 10:18:59 +02:00 |
|
Markus Makela
|
d98dd6e15f
|
Fixing errors caused by the merge with develop.
|
2015-03-05 11:14:12 +02:00 |
|
Markus Makela
|
561952e1ea
|
Moved service definition to router_options for shardrouter.
|
2015-02-26 20:34:35 +02:00 |
|
Markus Makela
|
5477cdf5eb
|
Renamed the dbshard module to schemarouter.
|
2015-02-24 05:49:38 +02:00 |
|