diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-08-05 19:00:54 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-08-05 19:00:54 -0400 |
| commit | 746c755d423d02a41a8e22a80e84ed4eff260ba4 (patch) | |
| tree | f9a3e54a48ed94728418cfe4f5a01e4d84584fe4 | |
| parent | 30b5a4de5d169cb82829938ffbe60512be89ffef (diff) | |
| download | mariadb-git-746c755d423d02a41a8e22a80e84ed4eff260ba4.tar.gz | |
MDEV-6495: local merge from maria-5.5-galera.
| -rw-r--r-- | debian/additions/my.cnf | 2 | ||||
| -rw-r--r-- | support-files/rpm/server.cnf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/additions/my.cnf b/debian/additions/my.cnf index 962a65c89ae..eed29b90a2b 100644 --- a/debian/additions/my.cnf +++ b/debian/additions/my.cnf @@ -165,7 +165,7 @@ innodb_flush_method = O_DIRECT #query_cache_size=0 # # Optional setting -#innodb_flush_log_at_trx_commit=2 +#innodb_flush_log_at_trx_commit=0 [mysqldump] quick diff --git a/support-files/rpm/server.cnf b/support-files/rpm/server.cnf index 850c8db7dd3..432df025406 100644 --- a/support-files/rpm/server.cnf +++ b/support-files/rpm/server.cnf @@ -25,7 +25,7 @@ #query_cache_size=0 # # Optional setting -#innodb_flush_log_at_trx_commit=2 +#innodb_flush_log_at_trx_commit=0 # this is only for embedded server [embedded] |