diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-07 12:23:58 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-07 12:23:58 +0300 |
| commit | a82ed92a6a721f45f23e210c132d5b33d3dccd21 (patch) | |
| tree | bb4c240cdc3dea2c4772a9fb2112054082ad0640 /plugin | |
| parent | 9f580bbc0e674bcb4b99a39767311539464b39d6 (diff) | |
| parent | d26fb96a9f225e53941fad5feb21abddbbf99a95 (diff) | |
| download | mariadb-git-a82ed92a6a721f45f23e210c132d5b33d3dccd21.tar.gz | |
Merge 10.2 into bb-10.2-ext
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 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"); |