diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-03-30 15:10:29 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-03-30 15:10:29 +0200 |
| commit | f573b65e4173a90a738682837e2f0020c76827ff (patch) | |
| tree | 913635826e68306e4804fa73ee17b301ac0f01e0 /sql/wsrep_applier.cc | |
| parent | 59df1009222a73fbd184987d1c8700f86b30792b (diff) | |
| parent | 880f2273fdc39cd1a2ab28f448cdfbf3d6581af2 (diff) | |
| download | mariadb-git-f573b65e4173a90a738682837e2f0020c76827ff.tar.gz | |
Merge MDEV-7847 and MDEV-7882 into 10.0.
Conflicts:
mysql-test/suite/rpl/r/rpl_parallel.result
sql/rpl_parallel.cc
Diffstat (limited to 'sql/wsrep_applier.cc')
0 files changed, 0 insertions, 0 deletions