diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2008-11-21 15:21:50 +0100 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2008-11-21 15:21:50 +0100 |
| commit | 33b194c36ec28528fd349dd17412848de2f1171c (patch) | |
| tree | 68cba4897925b9395dd0bfe53b5b95a777d78637 /support-files/my-innodb-heavy-4G.cnf.sh | |
| parent | 8d96bcda72df224f7a656cbcc1535a027bada75f (diff) | |
| parent | 1d521f6c20881997c9162bd11cadcbc77d20520b (diff) | |
| download | mariadb-git-33b194c36ec28528fd349dd17412848de2f1171c.tar.gz | |
Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or mysql-test/t/*myisam*.
However there were three new tests mysql-test/suite/parts/t/partition*myisam.test, of which I make here
copies for Maria.
Diffstat (limited to 'support-files/my-innodb-heavy-4G.cnf.sh')
| -rw-r--r-- | support-files/my-innodb-heavy-4G.cnf.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/support-files/my-innodb-heavy-4G.cnf.sh b/support-files/my-innodb-heavy-4G.cnf.sh index cc11ebfe63f..60b8138880e 100644 --- a/support-files/my-innodb-heavy-4G.cnf.sh +++ b/support-files/my-innodb-heavy-4G.cnf.sh @@ -191,6 +191,9 @@ tmp_table_size = 64M # the ability to do point in time recovery from your latest backup. log-bin=mysql-bin +# binary logging format - mixed recommended +binlog_format=mixed + # If you're using replication with chained slaves (A->B->C), you need to # enable this option on server B. It enables logging of updates done by # the slave thread into the slave's binary log. |