From 9ce788ff0bb4ff2265346cbd311f4e7d4123e9f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= <markus.makela@mariadb.com>
Date: Fri, 20 Sep 2019 09:02:53 +0300
Subject: [PATCH] MXS-2690: Fix duplicate database detection

Empty duplicate databases are now correctly detected since the results
will always return the database name combined with a trailing period.
---
 server/modules/routing/schemarouter/schemaroutersession.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/modules/routing/schemarouter/schemaroutersession.cc b/server/modules/routing/schemarouter/schemaroutersession.cc
index 3f7bbbddb..1c6da4173 100644
--- a/server/modules/routing/schemarouter/schemaroutersession.cc
+++ b/server/modules/routing/schemarouter/schemaroutersession.cc
@@ -1378,7 +1378,7 @@ void SchemaRouterSession::query_databases()
     m_state |= INIT_MAPPING;
     m_state &= ~INIT_UNINT;
 
-    GWBUF* buffer = modutil_create_query("SELECT schema_name FROM information_schema.schemata AS s "
+    GWBUF* buffer = modutil_create_query("SELECT CONCAT(schema_name, '.') FROM information_schema.schemata AS s "
                                          "LEFT JOIN information_schema.tables AS t ON s.schema_name = t.table_schema "
                                          "WHERE t.table_name IS NULL "
                                          "UNION "