From: Tor Didriksen
Date: October 17 2012 3:14pm
Subject: bzr push into mysql-trunk branch (tor.didriksen:4750 to 4751)
List-Archive: http://lists.mysql.com/commits/145064
Message-Id: <20121017151426.23778.3398.4751@atum07.no.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4751 Tor Didriksen	2012-10-17 [merge]
      merge 5.6 => trunk

    modified:
      unittest/gunit/segfault-t.cc
 4750 Tor Didriksen	2012-10-17 [merge]
      merge 5.6 => trunk

    modified:
      sql/global_threads.h
      sql/sql_show.cc
=== modified file 'unittest/gunit/segfault-t.cc'
--- a/unittest/gunit/segfault-t.cc	2012-10-16 08:41:13 +0000
+++ b/unittest/gunit/segfault-t.cc	2012-10-17 15:13:59 +0000
@@ -180,16 +180,19 @@ TEST(PrintUtilities, Printf)
   EXPECT_STREQ(sprintfbuff, buff);
 }
 
-TEST_F(FatalSignalDeathTest, TestHashFiloZeroSize)
+
+// After the fix for Bug#14689561, this is no longer a death test.
+TEST(HashFiloTest, TestHashFiloZeroSize)
 {
   hash_filo *t_cache;
   t_cache= new hash_filo(5, 0, 0,
                          (my_hash_get_key) NULL,
                          (my_hash_free_key) NULL,
                          NULL);
+  t_cache->clear();
   t_cache->resize(0);
   hash_filo_element entry;
-  //after resize (to zero) it tries to dereference last_link which is NULL
+  // After resize (to zero) it tries to dereference last_link which is NULL.
   t_cache->add(&entry);
   delete t_cache;
 }

No bundle (reason: useless for push emails).