2 files changed, 24 insertions, 38 deletions
diff --git a/storage/connect/ha_connect.h b/storage/connect/ha_connect.h
index 3f1ecc18af7..846f289a40c 100644
--- a/storage/connect/ha_connect.h
+++ b/storage/connect/ha_connect.h
@@ -551,3 +551,27 @@ public:
   uint    int_table_flags;            // Inherited from MyISAM
   bool    enable_activate_all_index;  // Inherited from MyISAM
 };  // end of ha_connect class definition
+
+
+/* This is a hack for ASAN
+ * Libraries such as libxml2 and libodbc do not like being unloaded before
+ * exit and will show as a leak in ASAN with no stack trace (as the plugin
+ * has been unloaded from memory).
+ *
+ * The below is designed to trick the compiler into adding a "UNIQUE" symbol
+ * which can be seen using:
+ * readelf -s storage/connect/ha_connect.so | grep UNIQUE
+ *
+ * Having this symbol means that the plugin remains in memory after dlclose()
+ * has been called. Thereby letting the libraries clean up properly.
+ */
+#if defined(__SANITIZE_ADDRESS__)
+__attribute__((__used__))
+inline int dummy(void)
+{
+  static int d;
+  d++;
+  return d;
+}
+#endif
+
diff --git a/storage/connect/libdoc.cpp b/storage/connect/libdoc.cpp
index aef7b551d65..54715da4ddc 100644
--- a/storage/connect/libdoc.cpp
+++ b/storage/connect/libdoc.cpp
@@ -290,46 +290,8 @@ if (!rc)
 /******************************************************************/
 /*  XML library cleanup function.                                 */
 /******************************************************************/
-/*
-  This is a copy of xmlCleanupParser() from the libxml2 sources
-  with xmlResetLastError() commented.
-
-  xmlResetLastError() called from the original xmlCleanupParser() causes
-  valgrind to report memory leaks. This happens because
-  ha_initialize_handlerton() is called from the main thread in mysqld.cc,
-  while ha_finalize_handlerton() is called from a non-main thread.
-  libxml2 gets confused because of xmlInitParser() and xmlCleanupParser()
-  being called from the different threads.
-
-  Perhaps the code in mysqld.cc should eventually be modified
-  to shutdown plugins from the main thread.
-*/
-static void
-xmlCleanupParser_replacement(void)
-  {
-  xmlCleanupCharEncodingHandlers();
-#ifdef LIBXML_CATALOG_ENABLED
-  xmlCatalogCleanup();
-#endif
-  xmlDictCleanup();
-  xmlCleanupInputCallbacks();
-#ifdef LIBXML_OUTPUT_ENABLED   
-  xmlCleanupOutputCallbacks();
-#endif
-#ifdef LIBXML_SCHEMAS_ENABLED
-  xmlSchemaCleanupTypes(); 
-  xmlRelaxNGCleanupTypes();
-#endif
-  //xmlResetLastError();
-  xmlCleanupGlobals();
-  xmlCleanupThreads(); /* must be last if called not from the main thread */
-  xmlCleanupMemory();
-  }
-
-
 void XmlCleanupParserLib(void)
   {
-  xmlCleanupParser_replacement();
   } // end of XmlCleanupParserLib
 
 /******************************************************************/