From 10e8ba13c66c9373d765b2dd7cc0159ce3191510 Mon Sep 17 00:00:00 2001
From: Monty <monty@mariadb.org>
Date: Wed, 8 May 2019 23:15:16 +0300
Subject: [PATCH] ha_discover_table_names() now always remove duplicates

Discoverred to be needed by the upcoming S3 engine
---
 sql/handler.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sql/handler.cc b/sql/handler.cc
index 22b2c0ea9e2..0269476509b 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -5634,6 +5634,8 @@ int ha_discover_table_names(THD *thd, LEX_CSTRING *db, MY_DIR *dirp,
     error= ext_table_discovery_simple(dirp, result) ||
            plugin_foreach(thd, discover_names,
                             MYSQL_STORAGE_ENGINE_PLUGIN, &args);
+    if (args.possible_duplicates > 0)
+      result->remove_duplicates();
   }
   else
   {