diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-06 19:28:51 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-06 19:28:51 +0300 |
| commit | 70db1e3b8adc1ef88bcbda2e69a30f17b7f87d0f (patch) | |
| tree | 5eea378d9752f55471ea2bc35f83ad5675471485 /plugin/metadata_lock_info | |
| parent | c59a52b7bad473a162a51000f2a24507c83b5fc8 (diff) | |
| parent | 7008d4616421fdf73d109ed297def27fa4679da4 (diff) | |
| download | mariadb-git-70db1e3b8adc1ef88bcbda2e69a30f17b7f87d0f.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'plugin/metadata_lock_info')
| -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 f2cdb99b82b..a2e3667dbab 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"); |