diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-04-26 21:10:13 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-04-26 21:10:13 +0300 |
| commit | 3e90ec6a582ec6a39209c00329ed93a7cc639ded (patch) | |
| tree | b6c7972aefbe2a8d4c3651b65e740684673ec52b /sql/ha_innodb.cc | |
| parent | 62af18cb8729894625d005e260838f68b7c57175 (diff) | |
| parent | 418467e32ad8617c1546870f1b24493601ca4d47 (diff) | |
| download | mariadb-git-3e90ec6a582ec6a39209c00329ed93a7cc639ded.tar.gz | |
Merge with 3.23:
Set innobase_flush_log_at_trx_commit to 1 by default
Fix problem with timestamp on 64 bit systems
Reserve alarms for up to 10 slave threads
BitKeeper/etc/logging_ok:
auto-union
mysql-test/t/rpl_alter.test:
Auto merged
mysys/charset.c:
Auto merged
sql/log_event.cc:
Auto merged
mysql-test/r/join.result:
Merge with 3.23
mysql-test/t/join.test:
Merge with 3.23
sql/ha_innodb.cc:
Merge with 3.23; Set innobase_flush_log_at_trx_commit to 1 by default
sql/log_event.h:
Merge with 3.23; Fix problem with timestamp on 64 bit systems
sql/mini_client.cc:
Use local version
sql/mysqld.cc:
Reserve alarms for up to 10 slave threads
sql/slave.cc:
Use local version
sql/sql_list.h:
Use local version
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 1363227605e..e0a3a69c819 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -100,7 +100,7 @@ char* innobase_unix_file_flush_method = NULL; /* Below we have boolean-valued start-up parameters, and their default values */ -uint innobase_flush_log_at_trx_commit = 0; +uint innobase_flush_log_at_trx_commit = 1; my_bool innobase_log_archive = FALSE; my_bool innobase_use_native_aio = FALSE; my_bool innobase_fast_shutdown = TRUE; |