Skip to content

Commit 842a339

Browse files
author
Tor Didriksen
committed
WL#16358 Support for 3rd party JavaScript libraries.
Post-push fix for broken unit test mdl-t In Debug mode: mdl-t: sql/mdl.h:481: void MDL_key::mdl_key_init(enum_mdl_namespace, const char *, const char *): Assertion `!use_normalized_object_name()' failed. unit test got signal 6 stack_bottom = 0 thread_stack 0x0 #0 0x67f2b7 _ZL14signal_handleri at unittest/gunit/gunit_test_main.cc:62 #1 0x7f9fd3e4fcff <unknown> at sysdeps/unix/sysv/linux/x86_64/libc_sigaction.c:0 .... #7 0x645bda _ZN7MDL_key12mdl_key_initENS_18enum_mdl_namespaceEPKcS2_ at sql/mdl.h:481 #8 0x65f6d1 _ZN11MDL_request16init_with_sourceEN7MDL_key18enum_mdl_namespaceEPKcS3_13enum_mdl_type17enum_mdl_durationS3_j at sql/mdl.cc:1520 #9 0x624783 _ZN12mdl_unittest39MDLHtonNotifyTest_NotifyNamespaces_Test8TestBodyEv at unittest/gunit/mdl-t.cc:3893 In RelWithDebInfo mode: unittest/gunit/mdl-t.cc:3902: Failure Expected equality of these values: 1U Which is: 1 pre_acquire_count() Which is: 0 Change-Id: I155ef98b40fb521a1721ba4f34e3a315ef847626
1 parent a23a2af commit 842a339

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

unittest/gunit/mdl-t.cc

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3870,7 +3870,7 @@ TEST_F(MDLHtonNotifyTest, NotifyNamespaces) {
38703870
false, // RESOURCE_GROUPS
38713871
false, // FOREIGN_KEY
38723872
false, // CHECK_CONSTRAINT
3873-
true // LIBRARY
3873+
false // LIBRARY
38743874
};
38753875
static_assert(
38763876
sizeof(notify_or_not) == MDL_key::NAMESPACE_END,
@@ -3880,6 +3880,7 @@ TEST_F(MDLHtonNotifyTest, NotifyNamespaces) {
38803880
MDL_request request;
38813881
if (static_cast<MDL_key::enum_mdl_namespace>(i) == MDL_key::FUNCTION ||
38823882
static_cast<MDL_key::enum_mdl_namespace>(i) == MDL_key::PROCEDURE ||
3883+
static_cast<MDL_key::enum_mdl_namespace>(i) == MDL_key::LIBRARY ||
38833884
static_cast<MDL_key::enum_mdl_namespace>(i) == MDL_key::TRIGGER ||
38843885
static_cast<MDL_key::enum_mdl_namespace>(i) == MDL_key::EVENT ||
38853886
static_cast<MDL_key::enum_mdl_namespace>(i) ==
@@ -3899,12 +3900,12 @@ TEST_F(MDLHtonNotifyTest, NotifyNamespaces) {
38993900
m_mdl_context.release_transactional_locks();
39003901

39013902
if (notify_or_not[i]) {
3902-
EXPECT_EQ(1U, pre_acquire_count());
3903-
EXPECT_EQ(1U, post_release_count());
3903+
EXPECT_EQ(1U, pre_acquire_count()) << "index:" << i;
3904+
EXPECT_EQ(1U, post_release_count()) << "index:" << i;
39043905
reset_counts_and_keys();
39053906
} else {
3906-
EXPECT_EQ(0U, pre_acquire_count());
3907-
EXPECT_EQ(0U, post_release_count());
3907+
EXPECT_EQ(0U, pre_acquire_count()) << "index:" << i;
3908+
EXPECT_EQ(0U, post_release_count()) << "index:" << i;
39083909
}
39093910
}
39103911
}

0 commit comments

Comments
 (0)