diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-09-09 16:52:22 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-09-09 16:52:22 +0300 |
| commit | ed2c4854dd9d6b75f052d0f7e824b68cc68e35d0 (patch) | |
| tree | 7615ce281add0dfaa6366a6776a26995613845cb /innobase/srv/srv0srv.c | |
| parent | 7de077f7dfc209bdfcc847920a394ff4c55a2e96 (diff) | |
| parent | bc787254247cb66a5e1adc0af6834c10737ecc6e (diff) | |
| download | mariadb-git-ed2c4854dd9d6b75f052d0f7e824b68cc68e35d0.tar.gz | |
merge
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/item.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_view.cc:
Auto merged
Diffstat (limited to 'innobase/srv/srv0srv.c')
| -rw-r--r-- | innobase/srv/srv0srv.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c index 4bc5b0dc795..389cd5b779d 100644 --- a/innobase/srv/srv0srv.c +++ b/innobase/srv/srv0srv.c @@ -77,6 +77,10 @@ ibool srv_file_per_table = FALSE; /* store to its own file each table created by an user; data dictionary tables are in the system tablespace 0 */ +ibool srv_locks_unsafe_for_binlog = FALSE; /* Place locks to records only + i.e. do not use next-key locking + except on duplicate key checking and + foreign key checking */ ulint srv_n_data_files = 0; char** srv_data_file_names = NULL; ulint* srv_data_file_sizes = NULL; /* size in database pages */ @@ -238,6 +242,9 @@ merge to completion before shutdown */ ibool srv_fast_shutdown = FALSE; +/* Generate a innodb_status.<pid> file */ +ibool srv_innodb_status = FALSE; + ibool srv_use_doublewrite_buf = TRUE; ibool srv_set_thread_priorities = TRUE; |