diff options
| author | unknown <heikki@hundin.mysql.fi> | 2002-09-20 05:44:41 +0300 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2002-09-20 05:44:41 +0300 |
| commit | 010a8b922eea10821c68d8dd0fdd74a1f5d4208d (patch) | |
| tree | 6bc7d58cce92983c1eb690b6b9272aeeedef1436 /innobase | |
| parent | ce62618ca739649bbe06eec57729e4d860617274 (diff) | |
| download | mariadb-git-010a8b922eea10821c68d8dd0fdd74a1f5d4208d.tar.gz | |
srv0srv.h, srv0srv.c, row0mysql.c:
Put back a change unintentionally removed in the last 2 pushes
innobase/row/row0mysql.c:
Put back a change unintentionally removed in the last 2 pushes
innobase/srv/srv0srv.c:
Put back a change unintentionally removed in the last 2 pushes
innobase/include/srv0srv.h:
Put back a change unintentionally removed in the last 2 pushes
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/include/srv0srv.h | 2 | ||||
| -rw-r--r-- | innobase/row/row0mysql.c | 4 | ||||
| -rw-r--r-- | innobase/srv/srv0srv.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/innobase/include/srv0srv.h b/innobase/include/srv0srv.h index 178c7b6971f..9de5e9ccfc9 100644 --- a/innobase/include/srv0srv.h +++ b/innobase/include/srv0srv.h @@ -53,7 +53,7 @@ extern ulint srv_n_log_files; extern ulint srv_log_file_size; extern ibool srv_log_archive_on; extern ulint srv_log_buffer_size; -extern ibool srv_flush_log_at_trx_commit; +extern ulint srv_flush_log_at_trx_commit; extern byte srv_latin1_ordering[256];/* The sort order table of the latin1 character set */ diff --git a/innobase/row/row0mysql.c b/innobase/row/row0mysql.c index 43eef8c5092..cea8f1316fe 100644 --- a/innobase/row/row0mysql.c +++ b/innobase/row/row0mysql.c @@ -1186,7 +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))); - if (srv_created_new_raw || srv_force_recovery) { + if (srv_created_new_raw) { fprintf(stderr, "InnoDB: A new raw disk partition was initialized or\n" "InnoDB: innodb_force_recovery is on: we do not allow\n" @@ -1707,7 +1707,7 @@ row_drop_table_for_mysql( ut_ad(trx->mysql_thread_id == os_thread_get_curr_id()); ut_a(name != NULL); - if (srv_created_new_raw || srv_force_recovery) { + if (srv_created_new_raw) { fprintf(stderr, "InnoDB: A new raw disk partition was initialized or\n" "InnoDB: innodb_force_recovery is on: we do not allow\n" diff --git a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c index 95bcd2351cd..30e95e3f51f 100644 --- a/innobase/srv/srv0srv.c +++ b/innobase/srv/srv0srv.c @@ -94,7 +94,7 @@ char** srv_log_group_home_dirs = NULL; ulint srv_n_log_groups = ULINT_MAX; ulint srv_n_log_files = ULINT_MAX; ulint srv_log_file_size = ULINT_MAX; /* size in database pages */ -ibool srv_log_archive_on = TRUE; +ulint srv_log_archive_on = 1; ulint srv_log_buffer_size = ULINT_MAX; /* size in database pages */ ibool srv_flush_log_at_trx_commit = TRUE; |