diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-13 13:28:12 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-13 13:28:12 +0300 |
| commit | a8379e53e8fa2f0c091daaf28b095d652e224952 (patch) | |
| tree | 20ad6e6dbacd01c43298d11f1b4c77bce50165f9 /sql/wsrep_trans_observer.h | |
| parent | ebd52051206620a0944ffc084582532c0c394523 (diff) | |
| parent | aae72f821abbee4d63a0925c06b18422d4c08ee8 (diff) | |
| download | mariadb-git-a8379e53e8fa2f0c091daaf28b095d652e224952.tar.gz | |
Merge 10.5 into 10.6
The changes to galera.galear_var_replicate_myisam_on
in commit d9b933bec6061758c5d7b34f55afcae32a85c110
are omitted due to conflicts
with commit 27d66d644cf2ebe9201e0362f2050036cce2908a.
Diffstat (limited to 'sql/wsrep_trans_observer.h')
0 files changed, 0 insertions, 0 deletions