summaryrefslogtreecommitdiff
path: root/sql/ha_innodb.cc
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2003-04-26 21:10:13 +0300
committermonty@mashka.mysql.fi <>2003-04-26 21:10:13 +0300
commit8b20a878cc1f420739a726a9be87d074390b899a (patch)
treeb6c7972aefbe2a8d4c3651b65e740684673ec52b /sql/ha_innodb.cc
parentbf6cfd2948f4cbab120a76aaf16d7ca0739cf2f4 (diff)
parentf88097eee92ac4efbcc38e325f751a60677dab6f (diff)
downloadmariadb-git-8b20a878cc1f420739a726a9be87d074390b899a.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
Diffstat (limited to 'sql/ha_innodb.cc')
-rw-r--r--sql/ha_innodb.cc2
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;