diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-07 12:30:56 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-07 12:30:56 +0300 |
commit | ae02407ce3a8fa17949383f9156101c9b464d586 (patch) | |
tree | a3f63df2a3186832faca5f470f4033d8099e9666 /plugin | |
parent | 8c0d873b76d2fe9651c1da8084b5ace0ff04b419 (diff) | |
parent | a82ed92a6a721f45f23e210c132d5b33d3dccd21 (diff) | |
download | mariadb-git-ae02407ce3a8fa17949383f9156101c9b464d586.tar.gz |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'plugin')
-rw-r--r-- | plugin/metadata_lock_info/metadata_lock_info.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/plugin/metadata_lock_info/metadata_lock_info.cc b/plugin/metadata_lock_info/metadata_lock_info.cc index 9fe764ea30b..ef6fdd5cc5c 100644 --- a/plugin/metadata_lock_info/metadata_lock_info.cc +++ b/plugin/metadata_lock_info/metadata_lock_info.cc @@ -45,12 +45,6 @@ static const LEX_STRING metadata_lock_info_lock_mode[] = { { C_STRING_WITH_LEN("MDL_EXCLUSIVE") }, }; -static const LEX_STRING metadata_lock_info_duration[] = { - { C_STRING_WITH_LEN("MDL_STATEMENT") }, - { C_STRING_WITH_LEN("MDL_TRANSACTION") }, - { C_STRING_WITH_LEN("MDL_EXPLICIT") }, -}; - static ST_FIELD_INFO i_s_metadata_lock_info_fields_info[] = { {"THREAD_ID", 20, MYSQL_TYPE_LONGLONG, 0, @@ -129,8 +123,6 @@ static int i_s_metadata_lock_info_init( == MDL_key::NAMESPACE_END); compile_time_assert(sizeof(metadata_lock_info_lock_mode)/sizeof(LEX_STRING) == MDL_TYPE_END); - compile_time_assert(sizeof(metadata_lock_info_duration)/sizeof(LEX_STRING) - == MDL_DURATION_END); ST_SCHEMA_TABLE *schema = (ST_SCHEMA_TABLE *) p; DBUG_ENTER("i_s_metadata_lock_info_init"); |