Update changelog and refresh patches after 10.0.30 import

debian/changelog

-mariadb-10.1 (10.1.21-6) UNRELEASED; urgency=low
+mariadb-10.1 (10.1.22-1) unstable; urgency=high
 
-  * Open a new changelog entry
+  * New upstream release 10.1.22. Includes fixes for the following
+    security vulnerabilities:
+    - CVE-2017-3313
+    - CVE-2017-3302
+  * New upstream also includes fix to logrotate so that it no longer
+    risks interrupting binary/relay log processing on the server.
+    https://github.com/MariaDB/server/commit/156cf86defdc59353f37f6
 
- -- Otto Kekäläinen <otto@debian.org>  Wed, 08 Mar 2017 10:10:11 +0200
+ -- Otto Kekäläinen <otto@debian.org>  Tue, 14 Mar 2017 16:21:58 +0200
 
 mariadb-10.1 (10.1.21-5) unstable; urgency=low
 

debian/patches/man_page_tokuftdump.patch

-Description: The patch adds a missing man page for tokuftdump
- Remove this once upstream has released an official fix.
-Author: Ian Gilfillan <ian@mariadb.org>
-
---- a/man/CMakeLists.txt
-+++ b/man/CMakeLists.txt
-@@ -22,7 +22,7 @@ SET(MAN1_SERVER innochecksum.1 my_print_
- 		mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1
- 		mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1
- 		mysqltest.1 perror.1 replace.1 resolve_stack_dump.1
--		resolveip.1 mysqlbug.1)
-+		resolveip.1 mysqlbug.1 tokuftdump.1)
- SET(MAN8_SERVER mysqld.8)
- SET(MAN1_CLIENT msql2mysql.1 mysql.1 mysql_find_rows.1 mysql_waitpid.1
- 		mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 mysqlcheck.1
---- /dev/null
-+++ b/man/tokuftdump.1
-@@ -0,0 +1,237 @@
-+'\" t
-+.\"
-+.TH "\FBTOKUFTDUMP\FR" "1" "04/07/2016" "MariaDB 10\&.0" "MariaDB Database System"
-+.\" -----------------------------------------------------------------
-+.\" * set default formatting
-+.\" -----------------------------------------------------------------
-+.\" disable hyphenation
-+.nh
-+.\" disable justification (adjust text to left margin only)
-+.ad l
-+.\" -----------------------------------------------------------------
-+.\" * MAIN CONTENT STARTS HERE *
-+.\" -----------------------------------------------------------------
-+.\" tokuftdump
-+.\" upgrading MySQL
-+.SH "NAME"
-+tokuftdump \- look into the fractal tree file
-+.SH "SYNOPSIS"
-+.HP \w'\fBtokuftdump\ [\fR\fB\fIoptions\fR\fR\fB]\fR\ 'u
-+\fBtokuftdump [\fR\fB\fIoptions\fR\fR\fB]\fR
-+.SH "DESCRIPTION"
-+.PP
-+\fBtokuftdump\fR
-+Investigates and diagnoses the fractal tree\&.
-+.PP
-+\fBtokuftdump\fR
-+supports the following options for processing option files\&.
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+.\" tokuftdump: interactive option
-+.\" interactive option: tokuftdump
-+\fB\-\-interactive\fR
-+.sp
-+Interactive\&.
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+.\" tokuftdump: support option
-+.\" support option: tokuftdump
-+\fB\-\-support \fI/path/to/fractal-tree/file\fR
-+.sp
-+An interactive way to see what messages and/or switch between FTs\&.
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+.\" tokuftdump: json option
-+.\" json option: tokuftdump
-+\fB\-\-json \fI/path/to/fractal-tree/file [output_json_file]\fR
-+.sp
-+If the output json file is left empty, FT\&.json will be created automatically\&.
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+.\" tokuftdump: nodata option
-+.\" nodata option: tokuftdump
-+\fB\-\-nodata\fR
-+.sp
-+Nodata\&.
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+.\" tokuftdump: dumpdata option
-+.\" dumpdata option: tokuftdump
-+\fB\-\-dumpdata = \fR\fB\fI0|1\fR\fR
-+.sp
-+Dumpdata\&.
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+.\" tokuftdump: header option
-+.\" header option: tokuftdump
-+\fB\-\-header\fR
-+.sp
-+Header\&.
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+.\" tokuftdump: rootnode option
-+.\" rootnode option: tokuftdump
-+\fB\-\-rootnode\fR
-+.sp
-+Rootnode\&.
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+.\" tokuftdump: node option
-+.\" node option: tokuftdump
-+\fB\-\-node \fIN\fR
-+.sp
-+Node\&.
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+.\" tokuftdump: fragmentation option
-+.\" fragmentation option: tokuftdump
-+\fB\-\-fragmentation\fR
-+.sp
-+Fragmentation\&.
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+.\" tokuftdump: garbage option
-+.\" garbage option: tokuftdump
-+\fB\-\-garbage\fR
-+.sp
-+Garbage\&.
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+.\" tokuftdump: tsv option
-+.\" tsv option: tokuftdump
-+\fB\-\-tsv\fR
-+.sp
-+TSV\&.
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+.\" tokuftdump: translation-table option
-+.\" translation-table option: tokuftdump
-+\fB\-\-translation\-table\fR
-+.sp
-+Translation table\&.
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+.\" tokuftdump: summary option
-+.\" summary option: tokuftdump
-+\fB\-\-summary\fR
-+.sp
-+Provide summary info\&.
-+.RE
-+.SH "COPYRIGHT"
-+.br
-+.PP
-+Copyright 2016 MariaDB Foundation
-+.PP
-+This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
-+.PP
-+This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-+.PP
-+You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
-+.sp
-+.SH "SEE ALSO"
-+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-+.SH AUTHOR
-+MariaDB Foundation (http://www.mariadb.org/).

debian/patches/man_pages_wsrep.patch

@@ -8,7 +8,7 @@ Author: Ian Gilfillan <ian@mariadb.org>
  		mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1
  		mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1
  		mysqltest.1 perror.1 replace.1 resolve_stack_dump.1
--		resolveip.1 mysqlbug.1 tokuftdump.1)
+-		resolveip.1 mysqlbug.1)
 +		resolveip.1 mysqlbug.1 tokuftdump.1
 +		galera_new_cluster.1 galera_recovery.1 mariadb-service-convert.1 mysqld_safe_helper.1
 +		wsrep_sst_common.1 wsrep_sst_mysqldump.1 wsrep_sst_rsync.1
@@ -36,143 +36,6 @@ Author: Ian Gilfillan <ian@mariadb.org>
 +.PP
 +For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
 --- /dev/null
-+++ b/man/mariadb-service-convert.1
-@@ -0,0 +1,20 @@
-+'\" t
-+.\"
-+.TH "\FBMARIADB-SERVICE-CONVERT\FR" "1" "26 January 2017" "MariaDB 10\&.1" "MariaDB Database System"
-+.\" -----------------------------------------------------------------
-+.\" * set default formatting
-+.\" -----------------------------------------------------------------
-+.\" disable hyphenation
-+.nh
-+.\" disable justification (adjust text to left margin only)
-+.ad l
-+.SH NAME
-+mariadb-service-convert \- generate a mariadb.service file based on the current mysql/mariadb settings
-+.SH DESCRIPTION
-+Use: Generate a mariadb.service file based on the current mysql/mariadb settings\.
-+This is to assist distro maintainers in migrating to systemd service definations from 
-+a user mysqld_safe settings in the my.cnf files\.
-+.PP
-+Redirect output to user directory like /etc/systemd/system/mariadb.service.d/migrated-from-my.cnf-settings.conf
-+.PP
-+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
---- /dev/null
-+++ b/man/mysqld_safe_helper.1
-@@ -0,0 +1,16 @@
-+'\" t
-+.\"
-+.TH "\FBMYSQLD_SAFE_HELPER\FR" "1" "26 January 2017" "MariaDB 10\&.1" "MariaDB Database System"
-+.\" -----------------------------------------------------------------
-+.\" * set default formatting
-+.\" -----------------------------------------------------------------
-+.\" disable hyphenation
-+.nh
-+.\" disable justification (adjust text to left margin only)
-+.ad l
-+.SH NAME
-+mysqld_safe_helper \- helper script
-+.SH DESCRIPTION
-+Use: Helper script\.
-+.PP
-+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
---- /dev/null
-+++ b/man/wsrep_sst_common.1
-@@ -0,0 +1,16 @@
-+'\" t
-+.\"
-+.TH "\FBWSREP_SST_COMMON\FR" "1" "26 January 2017" "MariaDB 10\&.1" "MariaDB Database System"
-+.\" -----------------------------------------------------------------
-+.\" * set default formatting
-+.\" -----------------------------------------------------------------
-+.\" disable hyphenation
-+.nh
-+.\" disable justification (adjust text to left margin only)
-+.ad l
-+.SH NAME
-+wsrep_sst_common \- common command line parser to be sourced by other SST scripts
-+.SH DESCRIPTION
-+Use: Common command line parser to be sourced by other SST scripts\.
-+.PP
-+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
---- /dev/null
-+++ b/man/wsrep_sst_mysqldump.1
-@@ -0,0 +1,16 @@
-+'\" t
-+.\"
-+.TH "\FBWSREP_SST_MYSQLDUMP\FR" "1" "26 January 2017" "MariaDB 10\&.1" "MariaDB Database System"
-+.\" -----------------------------------------------------------------
-+.\" * set default formatting
-+.\" -----------------------------------------------------------------
-+.\" disable hyphenation
-+.nh
-+.\" disable justification (adjust text to left margin only)
-+.ad l
-+.SH NAME
-+wsrep_sst_mysqldump \- mysqldump\-based state snapshot transfer
-+.SH DESCRIPTION
-+Use: mysqldump-based state snapshot transfer\.
-+.PP
-+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
---- /dev/null
-+++ b/man/wsrep_sst_rsync.1
-@@ -0,0 +1,16 @@
-+'\" t
-+.\"
-+.TH "\FBWSREP_SST_RSYNC\FR" "1" "26 January 2017" "MariaDB 10\&.1" "MariaDB Database System"
-+.\" -----------------------------------------------------------------
-+.\" * set default formatting
-+.\" -----------------------------------------------------------------
-+.\" disable hyphenation
-+.nh
-+.\" disable justification (adjust text to left margin only)
-+.ad l
-+.SH NAME
-+wsrep_sst_mysqldump \- rsync-based state snapshot transfer
-+.SH DESCRIPTION
-+Use: rsync-based state snapshot transfer\.
-+.PP
-+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
---- /dev/null
-+++ b/man/wsrep_sst_xtrabackup-v2.1
-@@ -0,0 +1,16 @@
-+'\" t
-+.\"
-+.TH "\FBWSREP_SST_XTRABACKUP-V2\FR" "1" "26 January 2017" "MariaDB 10\&.1" "MariaDB Database System"
-+.\" -----------------------------------------------------------------
-+.\" * set default formatting
-+.\" -----------------------------------------------------------------
-+.\" disable hyphenation
-+.nh
-+.\" disable justification (adjust text to left margin only)
-+.ad l
-+.SH NAME
-+wsrep_sst_xtrabackup-v2 \- xtrabackup\-based state snapshot transfer
-+.SH DESCRIPTION
-+Use: xtrabackup-based state snapshot transfer\.
-+.PP
-+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
---- /dev/null
-+++ b/man/wsrep_sst_xtrabackup.1
-@@ -0,0 +1,16 @@
-+'\" t
-+.\"
-+.TH "\FBWSREP_SST_XTRABACKUP\FR" "1" "24 January 2017" "MariaDB 10\&.1" "MariaDB Database System"
-+.\" -----------------------------------------------------------------
-+.\" * set default formatting
-+.\" -----------------------------------------------------------------
-+.\" disable hyphenation
-+.nh
-+.\" disable justification (adjust text to left margin only)
-+.ad l
-+.SH NAME
-+wsrep_sst_xtrabackup \- xtrabackup\-based state snapshot transfer
-+.SH DESCRIPTION
-+Use: xtrabackup-based state snapshot transfer\.
-+.PP
-+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
---- /dev/null
 +++ b/man/galera_new_cluster.1
 @@ -0,0 +1,16 @@
 +'\" t

debian/patches/mips-groonga-atomic.patch

@@ -18,7 +18,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
 --- a/storage/mroonga/vendor/groonga/lib/CMakeLists.txt
 +++ b/storage/mroonga/vendor/groonga/lib/CMakeLists.txt
-@@ -56,6 +56,7 @@ endif()
+@@ -62,6 +62,7 @@ endif()
  set_target_properties(libgroonga PROPERTIES OUTPUT_NAME "groonga")
  
  set(GRN_ALL_LIBRARIES

debian/patches/mips-unstable-tests.patch

@@ -4,30 +4,27 @@ Author: James Cowgill <jcowgill@debian.org>
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/mysql-test/unstable-tests
 +++ b/mysql-test/unstable-tests
-@@ -160,9 +160,8 @@ engines/funcs.*                  : Not m
- #----------------------------------------------------------------
+@@ -165,7 +165,6 @@ engines/funcs.*                  : Not m
  
- federated.federatedx             : MDEV-10617 - Wrong checksum, timeouts
--federated.federated_innodb       : MDEV-10617, MDEV-10417 - Wrong checksum, timeouts, fails on Mips
+ federated.federated_bug_35333    : Modified in 10.1.22
+ federated.federated_innodb       : MDEV-10617, MDEV-10417 - Wrong checksum, timeouts, fails on Mips
 -federated.federated_partition    : MDEV-10417 - Fails on Mips
--federated.federated_transactions : MDEV-10617, MDEV-10417 - Wrong checksum, timeouts, fails on Mips
-+federated.federated_innodb       : MDEV-10617 - Wrong checksum, timeouts
-+federated.federated_transactions : MDEV-10617 - Wrong checksum, timeouts
- 
- #----------------------------------------------------------------
+ federated.federated_transactions : MDEV-10617, MDEV-10417 - Wrong checksum, timeouts, fails on Mips
+ federated.federatedx             : MDEV-10617 - Wrong checksum, timeouts
  
-@@ -233,9 +232,8 @@ mroonga/storage.repair_table_no_index_fi
+@@ -246,10 +245,9 @@ mroonga/storage.repair_table_no_index_fi
  
  #----------------------------------------------------------------
  
--multi_source.gtid        : MDEV-10620, MDEV-10417 - Timeout in wait condition, fails on Mips
+-multi_source.gtid        : MDEV-10417 - Fails on Mips
  multi_source.info_logs   : MDEV-10042 - wrong result
--multi_source.multisource : MDEV-10417 - Fails on Mips; also uses binlog_start_pos.inc modified in 10.1.20
+-multi_source.multisource : MDEV-10417 - Fails on Mips
+ multi_source.reset_slave : MDEV-10690 - wrong result
 +multi_source.gtid        : MDEV-10620 - Timeout in wait condition
- multi_source.reset_slave : MDEV-10690 - wrong result; also uses binlog_start_pos.inc modified in 10.1.20
- multi_source.simple      : MDEV-4633 - Wrong slave status output; also uses binlog_start_pos.inc modified in 10.1.20
+ multi_source.simple      : MDEV-4633 - Wrong slave status output
  multi_source.status_vars : MDEV-4632 - failed while waiting for Slave_received_heartbeats
-@@ -271,14 +269,11 @@ roles.create_and_drop_role       : Modif
+ 
+@@ -311,12 +309,9 @@ plugins.two_password_validations : MDEV-
  
  rpl.last_insert_id                    : MDEV-10625 - warnings in error log
  rpl.rpl_alter_extra_persistent        : Added in 10.1.21
@@ -35,31 +32,28 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 -rpl.rpl_auto_increment_bug45679       : MDEV-10417 - Fails on Mips
  rpl.rpl_auto_increment_update_failure : MDEV-10625 - warnings in error log
  rpl.rpl_binlog_index                  : MDEV-9501 - Warning: failed registering on master
- rpl.rpl_checksum                      : Uses search_pattern_in_file.inc modified in 10.1.20
- rpl.rpl_checksum_cache                : MDEV-10626 - Testcase timeout
- rpl.rpl_circular_for_4_hosts          : MDEV-10627 - Testcase timeout
+ rpl.rpl_checksum_cache                : MDEV-12173 - Unexpected error
 -rpl.rpl_ddl                           : MDEV-10417 - Fails on Mips
  rpl.rpl_domain_id_filter_restart      : MDEV-10684 - Wrong result
  rpl.rpl_gtid_basic                    : MDEV-10681 - server startup problem
  rpl.rpl_gtid_crash                    : MDEV-9501 - Warning: failed registering on master
-@@ -288,19 +283,16 @@ rpl.rpl_gtid_mdev9033                 :
+@@ -324,18 +319,15 @@ rpl.rpl_gtid_mdev9033                 :
  rpl.rpl_gtid_stop_start               : MDEV-10629 - Crash on shutdown
  rpl.rpl_gtid_until                    : MDEV-10625 - warnings in error log
- rpl.rpl_heartbeat_basic               : MDEV-11668 - wrong result
+ rpl.rpl_heartbeat_basic               : Modified in 10.1.22
 -rpl.rpl_innodb_bug30888               : MDEV-10417 - Fails on Mips
  rpl.rpl_insert                        : MDEV-9329 - Fails on Ubuntu/s390x
  rpl.rpl_insert_delayed                : MDEV-9329 - Fails on Ubuntu/s390x
 -rpl.rpl_invoked_features              : MDEV-10417 - Fails on Mips
  rpl.rpl_mariadb_slave_capability      : MDEV-11018 - sporadic wrong events in binlog
- rpl.rpl_mdev10863                     : Added in 10.1.20
 -rpl.rpl_mdev6020                      : MDEV-10630, MDEV-10417 - Timeouts, fails on Mips
 +rpl.rpl_mdev6020                      : MDEV-10630, MDEV-10417 - Timeouts
- rpl.rpl_mdev6386                      : MDEV-10631 - Wrong result on slave
- rpl.rpl_parallel                      : MDEV-10632, MDEV-10653 - Failures to sync, timeouts
+ rpl.rpl_mdev6386                      : Modified in 10.1.22
+ rpl.rpl_parallel                      : MDEV-10653 - Timeouts
  rpl.rpl_parallel_optimistic           : MDEV-10511 - timeout
  rpl.rpl_parallel_retry                : MDEV-11119 - Server crash
  rpl.rpl_parallel_temptable            : MDEV-10356 - Crash in close_thread_tables
 -rpl.rpl_partition_innodb              : MDEV-10417 - Fails on Mips
- rpl.rpl_row_annotate                  : Uses binlog_start_pos.inc modified in 10.1.20
  rpl.rpl_password_boundaries           : MDEV-11534 - Slave IO warnings
- rpl.rpl_row_drop_create_temp_table    : MDEV-10626 - Testcase timeout
+ rpl.rpl_row_log_innodb                : MDEV-10688 - Wrong result
+ rpl.rpl_row_mysqlbinlog               : Modified in 10.1.21

debian/patches/mysql-test__db_test.patch

@@ -6,7 +6,7 @@
 ## DP: suite depends on them.
 --- a/mysql-test/mysql-test-run.pl
 +++ b/mysql-test/mysql-test-run.pl
-@@ -3185,6 +3185,11 @@ sub mysql_install_db {
+@@ -3187,6 +3187,11 @@ sub mysql_install_db {
      mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql",
  			   $bootstrap_sql_file);
  

debian/patches/remove-systemd-obsolete-target.patch

@@ -22,5 +22,5 @@ Author: Otto Kekäläinen <otto@mariadb.org>
  After=network.target
 -After=syslog.target
  
- ConditionPathExists=@INSTALL_SYSCONF2DIR@/my%I.cnf
+ ConditionPathExists=@sysconf2dir@/my%I.cnf
  

debian/patches/remove_rename_mariadb-server_files_in.patch

@@ -4,7 +4,7 @@ Author: Otto Kekäläinen <otto@seravo.fi>
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -442,12 +442,6 @@ CONFIGURE_FILE(
+@@ -445,12 +445,6 @@ CONFIGURE_FILE(
      ${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in
      ${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY)
  

debian/patches/series

@@ -9,7 +9,6 @@ remove_rename_mariadb-server_files_in.patch
 innodb_simulate_comp_test_speedup.patch
 mysqld_multi_confd.patch
 mysqld_multi.server_lsb-header.patch
-man_page_tokuftdump.patch
 man_pages_wsrep.patch
 mips-groonga-atomic.patch
 mips-connect-unaligned.patch