diff options
| author | unknown <heikki@hundin.mysql.fi> | 2002-11-06 00:41:27 +0200 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2002-11-06 00:41:27 +0200 |
| commit | 444d8207d9a277231733dc6cd58bf21b626bba31 (patch) | |
| tree | fed8334ab45443418d527c3837593e1121ed1975 /innobase/trx/trx0roll.c | |
| parent | 23f4865b163293006bbedbc2b69bc55ba1081baa (diff) | |
| download | mariadb-git-444d8207d9a277231733dc6cd58bf21b626bba31.tar.gz | |
Many files:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
sql/ha_innodb.cc:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/dict/dict0crea.c:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/dict/dict0dict.c:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/include/log0recv.h:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/include/row0mysql.h:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/include/srv0srv.h:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/include/trx0trx.h:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/log/log0recv.c:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/os/os0sync.c:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/os/os0thread.c:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/row/row0ins.c:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/row/row0mysql.c:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/row/row0purge.c:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/row/row0undo.c:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/row/row0upd.c:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/srv/srv0srv.c:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/srv/srv0start.c:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/trx/trx0roll.c:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/trx/trx0trx.c:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
Diffstat (limited to 'innobase/trx/trx0roll.c')
| -rw-r--r-- | innobase/trx/trx0roll.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/innobase/trx/trx0roll.c b/innobase/trx/trx0roll.c index 4c2ee5dc9be..1f0e0c58ac7 100644 --- a/innobase/trx/trx0roll.c +++ b/innobase/trx/trx0roll.c @@ -254,7 +254,7 @@ loop: mutex_exit(&kernel_mutex); if (trx->dict_operation) { - mutex_enter(&(dict_sys->mutex)); + row_mysql_lock_data_dictionary(trx); } que_run_threads(thr); @@ -290,14 +290,14 @@ loop: fprintf(stderr, "InnoDB: Table found: dropping table %s in recovery\n", table->name); - err = row_drop_table_for_mysql(table->name, trx, - TRUE); + err = row_drop_table_for_mysql(table->name, trx); + ut_a(err == (int) DB_SUCCESS); } } if (trx->dict_operation) { - mutex_exit(&(dict_sys->mutex)); + row_mysql_unlock_data_dictionary(trx); } fprintf(stderr, "InnoDB: Rolling back of trx id %lu %lu completed\n", |