diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-10-11 08:16:08 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-10-11 08:16:08 +0300 |
| commit | 07815d9555b099482f8877ec700bbc39d1d553dd (patch) | |
| tree | 60df9098dabb0a465317135b9a6daabf4152d2e7 /mysql-test/suite/rpl | |
| parent | 940f0c78a4c45536ddede5aaeeebcf36bda53251 (diff) | |
| parent | 3c3c4ae22545d3242a8b7c4f2bec3bf2d245890a (diff) | |
| download | mariadb-git-07815d9555b099482f8877ec700bbc39d1d553dd.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test/suite/rpl')
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_parallel_optimistic_nobinlog.cnf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_parallel_optimistic_nobinlog.cnf b/mysql-test/suite/rpl/t/rpl_parallel_optimistic_nobinlog.cnf index 0ea0d951568..b85a84f6625 100644 --- a/mysql-test/suite/rpl/t/rpl_parallel_optimistic_nobinlog.cnf +++ b/mysql-test/suite/rpl/t/rpl_parallel_optimistic_nobinlog.cnf @@ -5,5 +5,6 @@ log-slave-updates=0 loose-innodb [mysqld.2] +slave-transaction-retries=100 log-slave-updates=0 loose-innodb |