From: Tor Didriksen Date: November 19 2010 8:53am Subject: bzr commit into mysql-trunk branch (tor.didriksen:3358) List-Archive: http://lists.mysql.com/commits/124373 Message-Id: <20101119085357.3500037A1@atum07.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3905235712960312366==" --===============3905235712960312366== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///export/home/didrik/repo/trunk-bugfixing/ based on revid:bar@stripped 3358 Tor Didriksen 2010-11-19 Fix failing unit test after MDL interface change. modified: sql/mdl.cc unittest/gunit/mdl-t.cc === modified file 'sql/mdl.cc' --- a/sql/mdl.cc 2010-11-18 16:34:56 +0000 +++ b/sql/mdl.cc 2010-11-19 08:53:52 +0000 @@ -753,9 +753,9 @@ MDL_context::MDL_context() void MDL_context::destroy() { - DBUG_ASSERT(m_tickets[MDL_STATEMENT].is_empty() && - m_tickets[MDL_TRANSACTION].is_empty() && - m_tickets[MDL_EXPLICIT].is_empty()); + DBUG_ASSERT(m_tickets[MDL_STATEMENT].is_empty()); + DBUG_ASSERT(m_tickets[MDL_TRANSACTION].is_empty()); + DBUG_ASSERT(m_tickets[MDL_EXPLICIT].is_empty()); mysql_prlock_destroy(&m_LOCK_waiting_for); } === modified file 'unittest/gunit/mdl-t.cc' --- a/unittest/gunit/mdl-t.cc 2010-11-18 16:34:56 +0000 +++ b/unittest/gunit/mdl-t.cc 2010-11-19 08:53:52 +0000 @@ -292,8 +292,9 @@ TEST_F(MDL_DeathTest, die_when_m_tickets MDL_TRANSACTION); EXPECT_FALSE(m_mdl_context.try_acquire_lock(&m_request)); - EXPECT_DEATH(m_mdl_context.destroy(), ".*Assertion .*m_tickets.is_empty.*"); - m_mdl_context.release_all_locks_for_name(m_request.ticket); + EXPECT_DEATH(m_mdl_context.destroy(), + ".*Assertion.*MDL_TRANSACTION.*is_empty.*"); + m_mdl_context.release_transactional_locks(); } #endif // GTEST_HAS_DEATH_TEST && !defined(DBUG_OFF) @@ -326,7 +327,7 @@ void MDL_test::test_one_simple_shared_lo EXPECT_FALSE(m_mdl_context.try_acquire_lock(&request_2)); EXPECT_EQ(m_request.ticket, request_2.ticket); - m_mdl_context.release_all_locks_for_name(m_request.ticket); + m_mdl_context.release_transactional_locks(); EXPECT_FALSE(m_mdl_context.has_locks()); } @@ -391,8 +392,7 @@ TEST_F(MDL_test, one_exclusive) is_lock_owner(MDL_key::GLOBAL, "", "", MDL_INTENTION_EXCLUSIVE)); EXPECT_TRUE(m_request.ticket->is_upgradable_or_exclusive()); - m_mdl_context.release_all_locks_for_name(m_request.ticket); - m_mdl_context.release_lock(m_global_request.ticket); + m_mdl_context.release_transactional_locks(); EXPECT_FALSE(m_mdl_context.has_locks()); } @@ -404,10 +404,8 @@ TEST_F(MDL_test, one_exclusive) TEST_F(MDL_test, two_shared) { MDL_request request_2; - m_request.init(MDL_key::TABLE, db_name, table_name1, MDL_SHARED, - MDL_TRANSACTION); - request_2.init(MDL_key::TABLE, db_name, table_name2, MDL_SHARED, - MDL_TRANSACTION); + m_request.init(MDL_key::TABLE, db_name, table_name1, MDL_SHARED, MDL_EXPLICIT); + request_2.init(MDL_key::TABLE, db_name, table_name2, MDL_SHARED, MDL_EXPLICIT); EXPECT_FALSE(m_mdl_context.try_acquire_lock(&m_request)); EXPECT_FALSE(m_mdl_context.try_acquire_lock(&request_2)); @@ -457,8 +455,8 @@ TEST_F(MDL_test, shared_locks_between_co EXPECT_TRUE(mdl_context2. is_lock_owner(MDL_key::TABLE, db_name, table_name1, MDL_SHARED)); - m_mdl_context.release_all_locks_for_name(m_request.ticket); - mdl_context2.release_all_locks_for_name(request_2.ticket); + m_mdl_context.release_transactional_locks(); + mdl_context2.release_transactional_locks(); } @@ -483,8 +481,7 @@ TEST_F(MDL_test, upgrade_shared_upgradab upgrade_shared_lock_to_exclusive(m_request.ticket, long_timeout)); EXPECT_EQ(MDL_EXCLUSIVE, m_request.ticket->get_type()); - m_mdl_context.release_all_locks_for_name(m_request.ticket); - m_mdl_context.release_lock(m_global_request.ticket); + m_mdl_context.release_transactional_locks(); } @@ -589,7 +586,7 @@ TEST_F(MDL_test, concurrent_shared) release_locks.notify(); mdl_thread.join(); - m_mdl_context.release_all_locks_for_name(m_request.ticket); + m_mdl_context.release_transactional_locks(); } @@ -627,8 +624,7 @@ TEST_F(MDL_test, concurrent_shared_exclu EXPECT_FALSE(m_mdl_context.acquire_locks(&m_request_list, zero_timeout)); EXPECT_NE(m_null_ticket, m_request.ticket); - m_mdl_context.release_all_locks_for_name(m_request.ticket); - m_mdl_context.release_lock(m_global_request.ticket); + m_mdl_context.release_transactional_locks(); } @@ -659,7 +655,7 @@ TEST_F(MDL_test, concurrent_exclusive_sh EXPECT_NE(m_null_ticket, m_request.ticket); mdl_thread.join(); - m_mdl_context.release_all_locks_for_name(m_request.ticket); + m_mdl_context.release_transactional_locks(); } --===============3905235712960312366== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/tor.didriksen@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: tor.didriksen@stripped\ # nl8lklzit6s8ketd # target_branch: file:///export/home/didrik/repo/trunk-bugfixing/ # testament_sha1: edd5d11b16cc288508dd96fdc473c0ed0dd6910e # timestamp: 2010-11-19 09:53:57 +0100 # source_branch: file:///export/home/didrik/repo/5.5-bugteam-bug58137/ # base_revision_id: bar@stripped # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWY09EUcAApffgEAYUHf//3/n 3kq////wUAXLzRlDRtFURBQQSSTTSamZNGTTQ0nkUepo0NGaTTEHlB6mgCUQmEaaanoKh6TRoaHq AGgAAA9QOMmTJiMTACZMEyAGjCMAQwHGTJkxGJgBMmCZADRhGAIYBJEIAmJo0U9MjIZKep+qbFBo aeiHqMhtJNmbSWCG49w+mmvJgzMzQFAcOUH5IpgRVIq1ZgsogscYXYPZmDAB+h6i8UVUBVPp8ED8 ufgzlxV5R4lsS4hImdTUPJoXvFh2INB3au5fJm0hm83Po56euzypEZFTDsqSpw/m68bUaXz2GL9f DuCTCMA/1BOUdfgtHoScyNqqdFtB/uM1PvLTYcPsaQyckLls1Kvsm3FZ8rgNm2uRfHVV+1tNlKYo HTIH7EE48v6Tp2RuLSVlBVdznEYMh2B/l3qEuqe1Go1mnnFCrEq+eaojgMOMRVbECiBABl5OOQuY JkxbAqYvR8uAyXmsgMawhFjrikp72IJ54Zim8tSjlnFBGIJo+FCphAjrl628wXjT9YOjzYGwopQ7 dTd12IixlUFVj44WeprrNZlo9jyyxAh/m+Qg6M5MMV9DVONxM604wTZiHJEkc4ppNIlr2LMfvHM1 ZNWjShF5MDaEyLB92vTLX5adCVwpFuVaLoqDFF3600HcqLZFM1iNM0eRY7LiXGJx1bKpsl9i4UUB Q7BIC9qVIVKZd0dVdz1VHprmTgtcx5Y3QlG/ecRmMiaKDVtlxXFNIRPCs3q4DRTNmroeOxxZO9xm WVPhfO5GsLWDkzP6VZBdFY3GbC4sSaWHkNmlXkQLrOhFrjnwScoZSxKnAe3I6AIAX7SwyouKYigV F0VlFgpcWheKYFxNH68LxuqRyjmLAUxSlGltyxVzqLg0zRVSJp2no8Ul+qx2Xlhg4y+4bHzN/FRJ IOw8jyO46k/t8MhOmZm4nxUf5UQ5VKXkkO+pJg8py2e5UUrh/ymkVpz5qzmWJxFS9WGxb+DD6Yjv oPULSRJehesSKbSqDQSkZyYlPCbOqQ8FXM3D1T5AeAiYJbBt0iCJIN6DyIDz++gJiKkg8ZB+LFB7 Ok7O/oPo7fvP9QT9pAk49SRUghL6YnohnQcWFhfSyCvFWJWIMlMOWm78j3QMvjqiQOGspHWXuJ92 BLjvSXOKU5nEJfEVxEPGPBsZw2Fuu+MhEHzQOSKxLDmIgg3mDK9iwz9eBq33XYBOENBCx9ZMlSYj W3ZxG9bwCdI0z7CJ8XQrYVNZdBumfYaKjQdR59BLiWmbjmYe8tQxsQWdsEFxeXF+6ptvsmzNbL0i teyWNrP246EG0KhDlwTC5pbHEdzXaXrzjpKEiVEaScPtFNuTVSebnWJT6j+GkgaMWiIvtLXUa1DI mjE1ao2a+kwvG0ibcTXmVC1VjGOwxxLLcjYeNyB8bqcReLTWSNXUjNX/ecl792ifKpgZByoXnxRk HEDj9dG0rM+suI0tR3gOuhKcB0HIR4LaDLpCxEzlQEXJCNqBjZQUpDBpJkHIhPaBr7bkEjNuA5oW g7x+nqQMuC5Ho1aCUIXC2Wmzor7pplXpD6ql50mQMItC0okiLDtfi4w4GVUkFKhIIcnMDKaepBJY kozkMhXxCHnbuQZUhkVLudWzWdeOlhggpcPaVFWU07B2eJn0FofOm9ZFzanQOnTgHZFB3oIpbdF/ Y6pI8hFSw01ytecmdl2oPACCxBqUGee5BOIuiy32FKGKTMx1y8FX5sKlDNZXWFtEDvZkEQJQkRDE hQBqItuW66ijAcQ4bNFmmZdOA3BByMkxH24otXcqUDwlUuZ4ZtQajbbnL6SzP0YsblzqdY0YAwdi ovTVQSWG1aXOa4edchuWFYolcBD/i7kinChIRp6Io4A= --===============3905235712960312366==--