diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-06 15:32:56 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-06 15:32:56 +0300 |
| commit | cd694d76ce8dfcf22c685000b40fd90eae58e396 (patch) | |
| tree | b9800bec3859b0eff3c224b68258216b068e689e /plugin | |
| parent | 17589989eec9cf4e9f7084505710a42929efe115 (diff) | |
| parent | 6b45355e6bd70e77fcd4dd4d0ef74608bafc9b02 (diff) | |
| download | mariadb-git-cd694d76ce8dfcf22c685000b40fd90eae58e396.tar.gz | |
Merge 10.0 into 10.1
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 915ad8d2b88..39ac390b0bd 100644 --- a/plugin/metadata_lock_info/metadata_lock_info.cc +++ b/plugin/metadata_lock_info/metadata_lock_info.cc @@ -44,12 +44,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, @@ -128,8 +122,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"); |