diff options
| author | Sinisa@sinisa.nasamreza.org <> | 2004-11-16 17:46:35 +0200 |
|---|---|---|
| committer | Sinisa@sinisa.nasamreza.org <> | 2004-11-16 17:46:35 +0200 |
| commit | 7e5fb6eda6d109c3472c7faee23549cc55506351 (patch) | |
| tree | a1a6a98b44ac61c46e03cf4b9102cce61dacbb59 | |
| parent | ecebc2dd4356fb654002f710d98592469ee306ed (diff) | |
| parent | b75114c7d61a140b648c2d7a1bdeb9e9317f7874 (diff) | |
| download | mariadb-git-7e5fb6eda6d109c3472c7faee23549cc55506351.tar.gz | |
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-5.0
into sinisa.nasamreza.org:/mnt/work/petica
| -rw-r--r-- | sql/ha_innodb.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 650cb86e253..3ee7c323cb3 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -4687,7 +4687,7 @@ ha_innobase::get_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list) update_thd(current_thd); prebuilt->trx->op_info = (char*)"getting list of foreign keys"; trx_search_latch_release_if_reserved(prebuilt->trx); - mutex_enter(&(dict_sys->mutex)); + mutex_enter_noninline(&(dict_sys->mutex)); foreign = UT_LIST_GET_FIRST(prebuilt->table->foreign_list); while (foreign != NULL) @@ -4768,7 +4768,7 @@ ha_innobase::get_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list) f_key_list->push_back(pf_key_info); foreign = UT_LIST_GET_NEXT(foreign_list, foreign); } - mutex_exit(&(dict_sys->mutex)); + mutex_exit_noninline(&(dict_sys->mutex)); prebuilt->trx->op_info = (char*)""; DBUG_RETURN(0); } |