diff options
| author | heikki@hundin.mysql.fi <> | 2002-09-20 05:11:08 +0300 |
|---|---|---|
| committer | heikki@hundin.mysql.fi <> | 2002-09-20 05:11:08 +0300 |
| commit | 9e493e91e900a5793f98e1c1fd71369e2a929b5c (patch) | |
| tree | 83fa0b9921ca4d827b9a72cf561764aaaa2e4296 /innobase/row/row0mysql.c | |
| parent | a30d0261aeda4fc01b3fe4bc764caf76bd510a73 (diff) | |
| download | mariadb-git-9e493e91e900a5793f98e1c1fd71369e2a929b5c.tar.gz | |
Many files:
Modifications for query cache + trxs, fix of q.c.+ foreign keys
os0file.c:
Use unbuffered i/o in Windows
Diffstat (limited to 'innobase/row/row0mysql.c')
| -rw-r--r-- | innobase/row/row0mysql.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/innobase/row/row0mysql.c b/innobase/row/row0mysql.c index dc028b1c67b..43eef8c5092 100644 --- a/innobase/row/row0mysql.c +++ b/innobase/row/row0mysql.c @@ -1186,12 +1186,7 @@ row_create_table_for_mysql( ut_ad(trx->mysql_thread_id == os_thread_get_curr_id()); ut_ad(mutex_own(&(dict_sys->mutex))); - /* We allow a create table also if innodb_force_recovery is used. This - enables the user to stop a runaway rollback or a crash caused by - a temporary table #sql... He can use the trick explained in the - manual to rename the temporary table to rsql..., and then drop it. */ - - if (srv_created_new_raw) { + if (srv_created_new_raw || srv_force_recovery) { fprintf(stderr, "InnoDB: A new raw disk partition was initialized or\n" "InnoDB: innodb_force_recovery is on: we do not allow\n" @@ -1712,13 +1707,7 @@ row_drop_table_for_mysql( ut_ad(trx->mysql_thread_id == os_thread_get_curr_id()); ut_a(name != NULL); - /* Note that we allow dropping of a table even if innodb_force_recovery - is used. If a rollback or purge would crash because of a corrupt - table, the user can try dropping it to avoid the crash. This is also - a nice way to stop a runaway rollback caused by a failing big - table import in a single transaction. */ - - if (srv_created_new_raw) { + if (srv_created_new_raw || srv_force_recovery) { fprintf(stderr, "InnoDB: A new raw disk partition was initialized or\n" "InnoDB: innodb_force_recovery is on: we do not allow\n" |