fixup! af3dab7f

Add ASAN instrumentation

storage/innobase/include/small_vector.h

@@ -56,8 +56,16 @@ class small_vector : public small_vector_base
   }
 
 public:
-  small_vector() : small_vector_base(small, N) {}
-  ~small_vector() { if (small != begin()) my_free(begin()); }
+  small_vector() : small_vector_base(small, N)
+  {
+    TRASH_ALLOC(small, sizeof small);
+  }
+  ~small_vector()
+  {
+    if (small != begin())
+      my_free(begin());
+    MEM_MAKE_ADDRESSABLE(small, sizeof small);
+  }
 
   using iterator= T *;
   using const_iterator= const T *;

storage/innobase/mtr/mtr0mtr.cc

@@ -1244,6 +1244,7 @@ void small_vector_base::grow_by_1(void *small, size_t element_size)
   {
     new_begin= my_malloc(PSI_NOT_INSTRUMENTED, s, MYF(0));
     memcpy(new_begin, BeginX, size() * element_size);
+    TRASH_FREE(small, size() * element_size);
   }
   else
     new_begin= my_realloc(PSI_NOT_INSTRUMENTED, BeginX, s, MYF(0));