diff options
author | Sergei Golubchik <serg@mariadb.org> | 2017-03-30 12:48:42 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2017-03-30 12:48:42 +0200 |
commit | da4d71d10d23c1ac2d10b72baee14991ccb7a146 (patch) | |
tree | 7cdf3a8c8e72ca7c1c8105427c04123f025bd870 /support-files/my-innodb-heavy-4G.cnf.sh | |
parent | 9ec85009985d644ce7ae797bc3572d0ad0f69bb0 (diff) | |
parent | a00517ac9707ffd51c092f5af5d198c5ee789bb4 (diff) | |
download | mariadb-git-da4d71d10d23c1ac2d10b72baee14991ccb7a146.tar.gz |
Merge branch '10.1' into 10.2
Diffstat (limited to 'support-files/my-innodb-heavy-4G.cnf.sh')
-rw-r--r-- | support-files/my-innodb-heavy-4G.cnf.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/support-files/my-innodb-heavy-4G.cnf.sh b/support-files/my-innodb-heavy-4G.cnf.sh index d934b23cf0d..2590ff5ddea 100644 --- a/support-files/my-innodb-heavy-4G.cnf.sh +++ b/support-files/my-innodb-heavy-4G.cnf.sh @@ -306,7 +306,7 @@ server-id = 1 # Make the slave read-only. Only users with the SUPER privilege and the # replication slave thread will be able to modify data on it. You can -# use this to ensure that no applications will accidently modify data on +# use this to ensure that no applications will accidentally modify data on # the slave instead of the master #read_only @@ -439,7 +439,7 @@ innodb_log_files_in_group = 3 #innodb_log_group_home_dir # Maximum allowed percentage of dirty pages in the InnoDB buffer pool. -# If it is reached, InnoDB will start flushing them out agressively to +# If it is reached, InnoDB will start flushing them out aggressively to # not run out of clean pages at all. This is a soft limit, not # guaranteed to be held. innodb_max_dirty_pages_pct = 90 |