diff options
| author | Sunny Bains <Sunny.Bains@Oracle.Com> | 2010-08-20 12:57:04 +1000 |
|---|---|---|
| committer | Sunny Bains <Sunny.Bains@Oracle.Com> | 2010-08-20 12:57:04 +1000 |
| commit | 3daf6d3d73168971dfba30f7a248a6a48fca5691 (patch) | |
| tree | 236695809c7caacab79676cde60beb3bf7d7e8f1 /storage | |
| parent | b6c5f4537be428578e55b7c73fa6b624046c3089 (diff) | |
| download | mariadb-git-3daf6d3d73168971dfba30f7a248a6a48fca5691.tar.gz | |
Fix Bug #55027: assertion: mutex_own(&dict_sys->mutex) in dict_table_get_on_id()
The callers should indicate that the dictionary is locked or not using
the trx->dict_operation_lock_mode == RW_X_LATCH mode. Checking explicitly
for system tables is unnecessary.
Approved by Marko on IRC.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/dict/dict0dict.c | 3 | ||||
| -rw-r--r-- | storage/innodb_plugin/dict/dict0dict.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/storage/innobase/dict/dict0dict.c b/storage/innobase/dict/dict0dict.c index 9f9c4da46f4..0e323d2bf24 100644 --- a/storage/innobase/dict/dict0dict.c +++ b/storage/innobase/dict/dict0dict.c @@ -616,8 +616,7 @@ dict_table_get_on_id( { dict_table_t* table; - if (ut_dulint_cmp(table_id, DICT_FIELDS_ID) <= 0 - || trx->dict_operation_lock_mode == RW_X_LATCH) { + if (trx->dict_operation_lock_mode == RW_X_LATCH) { /* Note: An X latch implies that the transaction already owns the dictionary mutex. */ diff --git a/storage/innodb_plugin/dict/dict0dict.c b/storage/innodb_plugin/dict/dict0dict.c index fe4e058e122..a79f084e327 100644 --- a/storage/innodb_plugin/dict/dict0dict.c +++ b/storage/innodb_plugin/dict/dict0dict.c @@ -568,8 +568,7 @@ dict_table_get_on_id( { dict_table_t* table; - if (ut_dulint_cmp(table_id, DICT_FIELDS_ID) <= 0 - || trx->dict_operation_lock_mode == RW_X_LATCH) { + if (trx->dict_operation_lock_mode == RW_X_LATCH) { /* Note: An X latch implies that the transaction already owns the dictionary mutex. */ |