diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-24 22:42:35 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-24 22:42:35 +0200 |
commit | 78829a5780d3e48da376c1ca4e62731da450c551 (patch) | |
tree | 6561f2b6f09662220b9965bb14d745f69a4ecd34 /debian | |
parent | d6ba8496175a2dd85d772f8486eb032c31969f59 (diff) | |
parent | 947b6b849d907dc0793f076aec7e553869db744f (diff) | |
download | mariadb-git-78829a5780d3e48da376c1ca4e62731da450c551.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'debian')
-rw-r--r-- | debian/mariadb-server-10.4.install | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/debian/mariadb-server-10.4.install b/debian/mariadb-server-10.4.install index e0f83fbe95b..292c2c2a521 100644 --- a/debian/mariadb-server-10.4.install +++ b/debian/mariadb-server-10.4.install @@ -90,8 +90,7 @@ usr/share/man/man1/resolveip.1 usr/share/man/man1/wsrep_sst_common.1 usr/share/man/man1/wsrep_sst_mysqldump.1 usr/share/man/man1/wsrep_sst_rsync.1 -usr/share/man/man1/wsrep_sst_xtrabackup-v2.1 -usr/share/man/man1/wsrep_sst_xtrabackup.1 +usr/share/man/man1/wsrep_sst_mariabackup.1 usr/share/mysql/errmsg-utf8.txt usr/share/mysql/fill_help_tables.sql usr/share/mysql/maria_add_gis_sp_bootstrap.sql |