diff options
| author | unknown <monty@mysql.com> | 2004-11-02 08:58:45 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-11-02 08:58:45 +0200 |
| commit | 94839ddf5e23998c4e90776912f7d92a90277628 (patch) | |
| tree | f21b1c5d561fe5ca25c7f1f93db8805c0f4f3940 /innobase/dict/dict0dict.c | |
| parent | 46aa022aa6cf40801518d1be2c9e8e7ffcee9928 (diff) | |
| parent | 61ac832464a48afcf85f8c302734aa01d4346c78 (diff) | |
| download | mariadb-git-94839ddf5e23998c4e90776912f7d92a90277628.tar.gz | |
merge with 4.0
Build-tools/mysql-copyright:
Auto merged
Docs/Support/texi2html:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/eval/eval0eval.c:
Auto merged
innobase/pars/pars0pars.c:
Auto merged
Diffstat (limited to 'innobase/dict/dict0dict.c')
| -rw-r--r-- | innobase/dict/dict0dict.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/innobase/dict/dict0dict.c b/innobase/dict/dict0dict.c index c3d0d8d9ac1..bc08fc2437e 100644 --- a/innobase/dict/dict0dict.c +++ b/innobase/dict/dict0dict.c @@ -156,7 +156,7 @@ dict_index_build_internal_non_clust( dict_index_t* index); /* in: user representation of a non-clustered index */ /************************************************************************** -Removes a foreign constraint struct from the dictionet cache. */ +Removes a foreign constraint struct from the dictionary cache. */ static void dict_foreign_remove_from_cache( @@ -606,7 +606,7 @@ dict_table_get_on_id( dict_table_t* table; if (ut_dulint_cmp(table_id, DICT_FIELDS_ID) <= 0 - || trx->dict_operation) { + || trx->dict_operation_lock_mode == RW_X_LATCH) { /* It is a system table which will always exist in the table cache: we avoid acquiring the dictionary mutex, because if we are doing a rollback to handle an error in TABLE |