Bug #23258321 KEYRING_KEY_REMOVE CAUSES SERVER TO CRASH AFTER SERVER …

…RESTART - post push fix 2
mysql · May 13, 2016 · b8dabc1 · b8dabc1
1 parent c20497c
commit b8dabc1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/plugin/keyring/buffered_file_io.cc b/plugin/keyring/buffered_file_io.cc
@@ -243,7 +243,6 @@ my_bool Buffered_file_io::operator<<(const IKey* key)
 
 my_bool Buffered_file_io::operator>>(IKey **key)
 {
-  DBUG_ASSERT(*key == NULL);
   *key= NULL;
 
   boost::movelib::unique_ptr<Key> key_ptr(new Key());

diff --git a/unittest/gunit/keyring/buffered_file_io-t.cc b/unittest/gunit/keyring/buffered_file_io-t.cc
@@ -97,7 +97,7 @@ namespace keyring_buffered_file_io_unittest
 
     Buffered_file_io *buffered_io_2= new Buffered_file_io(logger);
     buffered_io_2->init(&file_name);
-    IKey *empty_key;
+    IKey *empty_key= NULL;
     retVal= *buffered_io_2 >> &empty_key;
     EXPECT_EQ(retVal, 1);
     EXPECT_STREQ("Robert_add_keyRoberts_add_key_type",