diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-06 14:36:46 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-06 14:36:46 +0300 |
| commit | 14c6f00a9f25430f995fb42c768e19a9d2a980e8 (patch) | |
| tree | b0ff411e6ca13668124a66ded3b5bb5a7721e595 /debian | |
| parent | baad0f3484ec3079a09a206576290091cc823428 (diff) | |
| parent | b82c602db588cfa688278ef772050c004590c124 (diff) | |
| download | mariadb-git-14c6f00a9f25430f995fb42c768e19a9d2a980e8.tar.gz | |
Merge 10.1 into 10.2
Also, include fixes by Vladislav Vaintroub to the
aws_key_management plugin. The AWS C++ SDK specifically depends on
OPENSSL_LIBRARIES, not generic SSL_LIBRARIES (such as YaSSL).
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/mariadb-backup-10.1.files | 2 | ||||
| -rw-r--r-- | debian/mariadb-server-10.2.install | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/debian/control b/debian/control index c501078f678..96271e046f3 100644 --- a/debian/control +++ b/debian/control @@ -622,4 +622,4 @@ Description: MariaDB database regression test suite - data files language in the world. The main goals of MariaDB are speed, robustness and ease of use. . - This package has the architecture independent data files for the test suite. + This package has the architecture independent data files for the test suite.
\ No newline at end of file diff --git a/debian/mariadb-backup-10.1.files b/debian/mariadb-backup-10.1.files new file mode 100644 index 00000000000..734117c92e2 --- /dev/null +++ b/debian/mariadb-backup-10.1.files @@ -0,0 +1,2 @@ +usr/bin/mariabackup +usr/bin/mbstream diff --git a/debian/mariadb-server-10.2.install b/debian/mariadb-server-10.2.install index 3b5a475f486..81981fe1f60 100644 --- a/debian/mariadb-server-10.2.install +++ b/debian/mariadb-server-10.2.install @@ -38,6 +38,7 @@ usr/bin/wsrep_sst_mysqldump usr/bin/wsrep_sst_rsync usr/bin/wsrep_sst_xtrabackup usr/bin/wsrep_sst_xtrabackup-v2 +usr/bin/wsrep_sst_mariabackup usr/lib/mysql/plugin/auth_pam.so usr/lib/mysql/plugin/auth_socket.so usr/lib/mysql/plugin/file_key_management.so |