Merge branch '2.1' into develop

2017-07-06 11:25:36 +03:00
parent c6b579619a 66048cf094
commit ef73f3e217
11 changed files with 210 additions and 2 deletions
--- a/server/modules/routing/schemarouter/shard_map.cc
+++ b/server/modules/routing/schemarouter/shard_map.cc
@ -32,6 +32,12 @@ bool Shard::add_location(std::string db, SERVER* target)
    return m_map.insert(std::make_pair(db, target)).second;
 }

+void Shard::replace_location(std::string db, SERVER* target)
+{
+    std::transform(db.begin(), db.end(), db.begin(), ::tolower);
+    m_map[db] = target;
+}
+
 SERVER* Shard::get_location(std::string db)
 {
    SERVER* rval = NULL;