Fix valgrind errors in unit tests.

Tor Didriksen · Tor Didriksen · commit 9bb6fa7bb3b8 · 2013-06-19T12:41:31.000+02:00
How to repeat:
valgrind --leak-check=full &lt;executable&gt; --gtest_filter="-*DeathTest*" &gt; foo
diff --git a/unittest/gunit/dynarray-t.cc b/unittest/gunit/dynarray-t.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. 
+/* Copyright (c) 2011, 2013 Oracle and/or its affiliates. All rights reserved. 
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -164,6 +164,11 @@ class DynArrayTest : public ::testing::Test
     m_keyuse_vec.reserve(num_elements);
   }
 
+  virtual void TearDown()
+  {
+    delete_dynamic(&m_keyuse_dyn);
+  }
+
   void insert_and_sort_dynamic()
   {
     reset_dynamic(&m_keyuse_dyn);
diff --git a/unittest/gunit/get_diagnostics-t.cc b/unittest/gunit/get_diagnostics-t.cc
@@ -145,12 +145,11 @@ TEST_F(GetDiagnosticsTest, Cmd)
 
 
 // Verifies death with a DBUG_ASSERT if target item is not settable.
-//
-// Although Google Test recommends DeathTest suffix for classes used
-// in death tests, this is not done to avoid the server being started
-// more than once.
+// Google Test recommends DeathTest suffix for classes used in death tests.
+typedef GetDiagnosticsTest GetDiagnosticsTestDeathTest;
+
 #if GTEST_HAS_DEATH_TEST && !defined(DBUG_OFF)
-TEST_F(GetDiagnosticsTest, DieWhenUnsettableItem)
+TEST_F(GetDiagnosticsTestDeathTest, DieWhenUnsettableItem)
 {
   Item *var;
   Sql_cmd *cmd;
diff --git a/unittest/gunit/mdl-t.cc b/unittest/gunit/mdl-t.cc
@@ -1576,6 +1576,7 @@ TEST_F(MDLTest, HogLockTest5)
   mdl_thread3.join();
   mdl_thread4.join();
   mdl_thread5.join();
+  mdl_thread6.join();
 
   max_write_lock_count= org_max_write_lock_count;
 }

Original file line number	Diff line number	Diff line change
`@@ -1576,6 +1576,7 @@ TEST_F(MDLTest, HogLockTest5)`
`1576`	`1576`	`mdl_thread3.join();`
`1577`	`1577`	`mdl_thread4.join();`
`1578`	`1578`	`mdl_thread5.join();`
	`1579`	`+ mdl_thread6.join();`
`1579`	`1580`
`1580`	`1581`	`max_write_lock_count= org_max_write_lock_count;`
`1581`	`1582`	`}`