MDEV-4786 - merge 10.0-monty - 10.0

Fixed sql_discovery.simple failure.

storage/sequence/sequence.cc:
  Let sequence share class have unique name to avoid collision with other
  classes.
storage/test_sql_discovery/test_sql_discovery.cc:
  Let test_sql_discovery share class have unique name to avoid collision with
  other classes.

1 files changed, 9 insertions, 9 deletions

diff --git a/storage/test_sql_discovery/test_sql_discovery.cc b/storage/test_sql_discovery/test_sql_discovery.cc
index 5c4294dc49b..e9efa47a4ec 100644
--- a/storage/test_sql_discovery/test_sql_discovery.cc
+++ b/storage/test_sql_discovery/test_sql_discovery.cc
@@ -40,14 +40,14 @@ static struct st_mysql_sys_var *sysvars[] = {
   NULL
 };
 
-class SHARE : public Handler_share {
+class TSD_share : public Handler_share {
 public:
   THR_LOCK lock;
-  SHARE()
+  TSD_share()
   {
     thr_lock_init(&lock);
   }
-  ~SHARE()
+  ~TSD_share()
   {
     thr_lock_delete(&lock);
   }
@@ -57,8 +57,8 @@ class ha_tsd: public handler
 {
 private:
   THR_LOCK_DATA lock;
-  SHARE *share;
-  SHARE *get_share();
+  TSD_share *share;
+  TSD_share *get_share();
 
 public:
   ha_tsd(handlerton *hton, TABLE_SHARE *table_arg)
@@ -94,13 +94,13 @@ public:
   int close(void);
 };
 
-SHARE *ha_tsd::get_share()
+TSD_share *ha_tsd::get_share()
 {
-  SHARE *tmp_share;
+  TSD_share *tmp_share;
   lock_shared_ha_data();
-  if (!(tmp_share= static_cast<SHARE*>(get_ha_share_ptr())))
+  if (!(tmp_share= static_cast<TSD_share*>(get_ha_share_ptr())))
   {
-    tmp_share= new SHARE;
+    tmp_share= new TSD_share;
     if (!tmp_share)
       goto err;