summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2019-10-30 21:33:01 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2019-10-30 21:33:01 +0100
commit36f67a7dff9087236e3c8b99452702b638fd020e (patch)
tree70835feb15dd56efaab13257ecf721f77c9295a5 /debian
parentcd1c10859d77d967aec8590fa9de4d17ed480dbf (diff)
parentc8ba98206f1b08bf02c6a6f993b8e1b6842cb665 (diff)
downloadmariadb-git-36f67a7dff9087236e3c8b99452702b638fd020e.tar.gz
Merge branch '10.1' into 10.2
Diffstat (limited to 'debian')
-rw-r--r--debian/additions/my.cnf2
1 files changed, 0 insertions, 2 deletions
diff --git a/debian/additions/my.cnf b/debian/additions/my.cnf
index d30ec182c8b..22103ec09c9 100644
--- a/debian/additions/my.cnf
+++ b/debian/additions/my.cnf
@@ -131,8 +131,6 @@ max_binlog_size = 100M
# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
# Read the manual for more InnoDB related options. There are many!
default_storage_engine = InnoDB
-# you can't just change log file size, requires special procedure
-#innodb_log_file_size = 50M
innodb_buffer_pool_size = 256M
innodb_log_buffer_size = 8M
innodb_file_per_table = 1