diff options
author | Sergei Golubchik <serg@mariadb.org> | 2015-09-25 10:24:14 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2015-09-25 10:24:14 +0200 |
commit | 9554342d16a6567329cf6269129f9db4ea0be8c7 (patch) | |
tree | 09b948047b1b95ea4d964857cc09a33ba8fa835f /debian | |
parent | 5448df084b885ab744711888037bcc83bc2545f0 (diff) | |
parent | 4070ce00dc95e320c68e9d9b623893b034fb913e (diff) | |
download | mariadb-git-9554342d16a6567329cf6269129f9db4ea0be8c7.tar.gz |
Merge branch '10.1' into pull-request-97
Merge downstream Debian packaging (MDEV-6284)
Diffstat (limited to 'debian')
-rw-r--r-- | debian/additions/my.cnf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/additions/my.cnf b/debian/additions/my.cnf index 1f8bc0209eb..aa7ed87b39e 100644 --- a/debian/additions/my.cnf +++ b/debian/additions/my.cnf @@ -156,6 +156,7 @@ innodb_flush_method = O_DIRECT # [galera] # Mandatory settings +#wsrep_on=ON #wsrep_provider= #wsrep_cluster_address= #binlog_format=row |