diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-02-01 14:09:48 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-02-01 14:09:48 +0200 |
| commit | c7e5feb2596e2a032207191320dbf1387d440959 (patch) | |
| tree | b4a5f850c3ab553a9a3c6b1b58bc5280ed42a861 /scripts/wsrep_sst_xtrabackup-v2.sh | |
| parent | 08b2c516da4df91082ae9fbe5e060959c4bb5faa (diff) | |
| parent | d01dbe66a8bf9cb6031f95159c49100f9299a768 (diff) | |
| download | mariadb-git-c7e5feb2596e2a032207191320dbf1387d440959.tar.gz | |
Merge tag 'mariadb-10.0.34' into 10.0-galeramariadb-galera-10.0.34
Conflicts:
storage/innobase/lock/lock0lock.cc
storage/xtradb/lock/lock0lock.cc
storage/xtradb/lock/lock0wait.cc
support-files/mysql.server.sh
Diffstat (limited to 'scripts/wsrep_sst_xtrabackup-v2.sh')
0 files changed, 0 insertions, 0 deletions