summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOtto Kekäläinen <otto@kekalainen.net>2022-05-02 22:07:58 -0700
committerDaniel Black <daniel@mariadb.org>2022-05-05 12:06:56 +1000
commitd426d0782da3ebe5ee5bad6bd42ad09aee3cd65e (patch)
treeaf1a135472cf1711b8f9d1b4824070ed10e4da3e
parenta82cdb0690543f061be3c7debdb4829e538fde96 (diff)
downloadmariadb-git-d426d0782da3ebe5ee5bad6bd42ad09aee3cd65e.tar.gz
Deb: Use --fail-missing and ensure the not-installed list is up-to-date
Make the Debian build fail if it detects that the build (CMake) created files that are not used in any package nor accounted in the special not-installed file. Stop creating symbolic links in Debian packaging for files that the CMake build already created. Document known cases of files that are intentionally not installed. Leave the rest in the not-installed list for visibility. The list can later be trimmed down and having the --fail-missing will prevent any new unaccounted files from being introduced. Note that despite extensive refactoring in the Debian packaging files, there was no changes in the packages produced as verified by package files lists before and after.
-rw-r--r--debian/libmariadb-dev.install1
-rw-r--r--debian/libmariadb-dev.links1
-rw-r--r--debian/mariadb-backup.install1
-rw-r--r--debian/mariadb-backup.links1
-rw-r--r--debian/mariadb-client-core.install1
-rw-r--r--debian/mariadb-client-core.links1
-rw-r--r--debian/mariadb-client.install11
-rw-r--r--debian/mariadb-client.links10
-rw-r--r--debian/mariadb-plugin-rocksdb.install1
-rw-r--r--debian/mariadb-plugin-rocksdb.links1
-rw-r--r--debian/mariadb-server-core.install3
-rw-r--r--debian/mariadb-server-core.links3
-rw-r--r--debian/mariadb-server.install10
-rw-r--r--debian/mariadb-server.links10
-rw-r--r--debian/mariadb-test.install7
-rw-r--r--debian/mariadb-test.links7
-rw-r--r--debian/not-installed180
-rwxr-xr-xdebian/rules2
18 files changed, 192 insertions, 59 deletions
diff --git a/debian/libmariadb-dev.install b/debian/libmariadb-dev.install
index 1e52e2acfdc..1a9aa3661e0 100644
--- a/debian/libmariadb-dev.install
+++ b/debian/libmariadb-dev.install
@@ -1,3 +1,4 @@
+usr/bin/mariadb-config
usr/bin/mariadb_config
usr/include/mariadb/errmsg.h
usr/include/mariadb/ma_list.h
diff --git a/debian/libmariadb-dev.links b/debian/libmariadb-dev.links
index 31a5f655555..b6d84cc8369 100644
--- a/debian/libmariadb-dev.links
+++ b/debian/libmariadb-dev.links
@@ -1,2 +1 @@
-usr/bin/mariadb_config usr/bin/mariadb-config
usr/share/man/man1/mariadb_config.1.gz usr/share/man/man1/mariadb-config.1.gz
diff --git a/debian/mariadb-backup.install b/debian/mariadb-backup.install
index b332b8724d5..e450f8f46a0 100644
--- a/debian/mariadb-backup.install
+++ b/debian/mariadb-backup.install
@@ -1,3 +1,4 @@
+usr/bin/mariabackup
usr/bin/mariadb-backup
usr/bin/mbstream
usr/share/man/man1/mariabackup.1
diff --git a/debian/mariadb-backup.links b/debian/mariadb-backup.links
deleted file mode 100644
index 924b476393b..00000000000
--- a/debian/mariadb-backup.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/mariadb-backup usr/bin/mariabackup
diff --git a/debian/mariadb-client-core.install b/debian/mariadb-client-core.install
index 421b62d2a1a..bcc3515a02f 100644
--- a/debian/mariadb-client-core.install
+++ b/debian/mariadb-client-core.install
@@ -1,6 +1,7 @@
usr/bin/mariadb
usr/bin/mariadb-check
usr/bin/my_print_defaults
+usr/bin/mysql
usr/share/man/man1/mariadb-check.1
usr/share/man/man1/mariadb.1
usr/share/man/man1/my_print_defaults.1
diff --git a/debian/mariadb-client-core.links b/debian/mariadb-client-core.links
deleted file mode 100644
index 5134dd814b5..00000000000
--- a/debian/mariadb-client-core.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/mariadb usr/bin/mysql
diff --git a/debian/mariadb-client.install b/debian/mariadb-client.install
index 3a92ded15b6..fba8d093810 100644
--- a/debian/mariadb-client.install
+++ b/debian/mariadb-client.install
@@ -22,6 +22,17 @@ usr/bin/mariadb-slap
usr/bin/mariadb-tzinfo-to-sql
usr/bin/mariadb-waitpid
usr/bin/msql2mysql
+usr/bin/mysql_find_rows
+usr/bin/mysql_fix_extensions
+usr/bin/mysql_waitpid
+usr/bin/mysqlaccess
+usr/bin/mysqladmin
+usr/bin/mysqlcheck
+usr/bin/mysqldump
+usr/bin/mysqldumpslow
+usr/bin/mysqlimport
+usr/bin/mysqlshow
+usr/bin/mysqlslap
usr/bin/mytop
usr/bin/perror
usr/bin/replace
diff --git a/debian/mariadb-client.links b/debian/mariadb-client.links
index bc42197629b..62e3651daf5 100644
--- a/debian/mariadb-client.links
+++ b/debian/mariadb-client.links
@@ -1,5 +1,3 @@
-usr/bin/mariadb-access usr/bin/mysqlaccess
-usr/bin/mariadb-admin usr/bin/mysqladmin
usr/bin/mariadb-check usr/bin/mariadb-analyze
usr/bin/mariadb-check usr/bin/mariadb-optimize
usr/bin/mariadb-check usr/bin/mariadb-repair
@@ -8,15 +6,7 @@ usr/bin/mariadb-check usr/bin/mysqlanalyze
usr/bin/mariadb-check usr/bin/mysqlcheck
usr/bin/mariadb-check usr/bin/mysqloptimize
usr/bin/mariadb-check usr/bin/mysqlrepair
-usr/bin/mariadb-dump usr/bin/mysqldump
-usr/bin/mariadb-dumpslow usr/bin/mysqldumpslow
-usr/bin/mariadb-find-rows usr/bin/mysql_find_rows
-usr/bin/mariadb-fix-extensions usr/bin/mysql_fix_extensions
-usr/bin/mariadb-import usr/bin/mysqlimport
usr/bin/mariadb-report usr/bin/mysqlreport
-usr/bin/mariadb-show usr/bin/mysqlshow
-usr/bin/mariadb-slap usr/bin/mysqlslap
-usr/bin/mariadb-waitpid usr/bin/mysql_waitpid
usr/share/man/man1/mariadb-check.1.gz usr/share/man/man1/mariadb-analyze.1.gz
usr/share/man/man1/mariadb-check.1.gz usr/share/man/man1/mariadb-optimize.1.gz
usr/share/man/man1/mariadb-check.1.gz usr/share/man/man1/mariadb-repair.1.gz
diff --git a/debian/mariadb-plugin-rocksdb.install b/debian/mariadb-plugin-rocksdb.install
index dcc576ea937..67b8026d697 100644
--- a/debian/mariadb-plugin-rocksdb.install
+++ b/debian/mariadb-plugin-rocksdb.install
@@ -1,6 +1,7 @@
etc/mysql/mariadb.conf.d/rocksdb.cnf
usr/bin/mariadb-ldb
usr/bin/myrocks_hotbackup
+usr/bin/mysql_ldb
usr/lib/mysql/plugin/ha_rocksdb.so
usr/share/man/man1/mariadb-ldb.1
usr/share/man/man1/myrocks_hotbackup.1
diff --git a/debian/mariadb-plugin-rocksdb.links b/debian/mariadb-plugin-rocksdb.links
deleted file mode 100644
index d24682a5a66..00000000000
--- a/debian/mariadb-plugin-rocksdb.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/mariadb-ldb usr/bin/mysql_ldb
diff --git a/debian/mariadb-server-core.install b/debian/mariadb-server-core.install
index f760f34e3f7..93acce6cc7d 100644
--- a/debian/mariadb-server-core.install
+++ b/debian/mariadb-server-core.install
@@ -1,8 +1,11 @@
usr/bin/innochecksum
usr/bin/mariadb-install-db
usr/bin/mariadb-upgrade
+usr/bin/mysql_install_db
+usr/bin/mysql_upgrade
usr/bin/resolveip
usr/sbin/mariadbd
+usr/sbin/mysqld
usr/share/man/man1/innochecksum.1
usr/share/man/man1/mariadb-install-db.1
usr/share/man/man1/mariadb-upgrade.1
diff --git a/debian/mariadb-server-core.links b/debian/mariadb-server-core.links
deleted file mode 100644
index c2be98f38fb..00000000000
--- a/debian/mariadb-server-core.links
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin/mariadb-install-db usr/bin/mysql_install_db
-usr/bin/mariadb-upgrade usr/bin/mysql_upgrade
-usr/sbin/mariadbd usr/sbin/mysqld
diff --git a/debian/mariadb-server.install b/debian/mariadb-server.install
index f75fdb46d47..254e9cc8945 100644
--- a/debian/mariadb-server.install
+++ b/debian/mariadb-server.install
@@ -26,6 +26,16 @@ usr/bin/myisam_ftdump
usr/bin/myisamchk
usr/bin/myisamlog
usr/bin/myisampack
+usr/bin/mysql_convert_table_format
+usr/bin/mysql_plugin
+usr/bin/mysql_secure_installation
+usr/bin/mysql_setpermission
+usr/bin/mysql_tzinfo_to_sql
+usr/bin/mysqlbinlog
+usr/bin/mysqld_multi
+usr/bin/mysqld_safe
+usr/bin/mysqld_safe_helper
+usr/bin/mysqlhotcopy
usr/bin/wsrep_sst_common
usr/bin/wsrep_sst_mariabackup
usr/bin/wsrep_sst_mysqldump
diff --git a/debian/mariadb-server.links b/debian/mariadb-server.links
deleted file mode 100644
index 9cc3a436ba8..00000000000
--- a/debian/mariadb-server.links
+++ /dev/null
@@ -1,10 +0,0 @@
-usr/bin/mariadb-binlog usr/bin/mysqlbinlog
-usr/bin/mariadb-convert-table-format usr/bin/mysql_convert_table_format
-usr/bin/mariadb-hotcopy usr/bin/mysqlhotcopy
-usr/bin/mariadb-plugin usr/bin/mysql_plugin
-usr/bin/mariadb-secure-installation usr/bin/mysql_secure_installation
-usr/bin/mariadb-setpermission usr/bin/mysql_setpermission
-usr/bin/mariadb-tzinfo-to-sql usr/bin/mysql_tzinfo_to_sql
-usr/bin/mariadbd-multi usr/bin/mysqld_multi
-usr/bin/mariadbd-safe usr/bin/mysqld_safe
-usr/bin/mariadbd-safe-helper usr/bin/mysqld_safe_helper
diff --git a/debian/mariadb-test.install b/debian/mariadb-test.install
index e587a3bf73d..5dda38d665c 100644
--- a/debian/mariadb-test.install
+++ b/debian/mariadb-test.install
@@ -2,6 +2,10 @@ usr/bin/mariadb-client-test
usr/bin/mariadb-client-test-embedded
usr/bin/mariadb-test
usr/bin/mariadb-test-embedded
+usr/bin/mysql_client_test
+usr/bin/mysql_client_test_embedded
+usr/bin/mysqltest
+usr/bin/mysqltest_embedded
usr/lib/*/libmariadb3/plugin/auth_test_plugin.so
usr/lib/*/libmariadb3/plugin/qa_auth_client.so
usr/lib/*/libmariadb3/plugin/qa_auth_interface.so
@@ -37,7 +41,10 @@ usr/share/mysql/mysql-test/README.stress
usr/share/mysql/mysql-test/dgcov.pl
usr/share/mysql/mysql-test/lib
usr/share/mysql/mysql-test/mariadb-stress-test.pl
+usr/share/mysql/mysql-test/mariadb-test-run
usr/share/mysql/mysql-test/mariadb-test-run.pl
+usr/share/mysql/mysql-test/mtr
+usr/share/mysql/mysql-test/mysql-test-run
usr/share/mysql/mysql-test/mysql-test-run.pl
usr/share/mysql/mysql-test/purify.supp
usr/share/mysql/mysql-test/suite.pm
diff --git a/debian/mariadb-test.links b/debian/mariadb-test.links
index c7e4ae10063..3939176ee96 100644
--- a/debian/mariadb-test.links
+++ b/debian/mariadb-test.links
@@ -1,8 +1 @@
-usr/bin/mariadb-client-test usr/bin/mysql_client_test
-usr/bin/mariadb-client-test-embedded usr/bin/mysql_client_test_embedded
-usr/bin/mariadb-test usr/bin/mysqltest
-usr/bin/mariadb-test-embedded usr/bin/mysqltest_embedded
-usr/share/mysql/mysql-test/mariadb-test-run.pl usr/share/mysql/mysql-test/mariadb-test-run
-usr/share/mysql/mysql-test/mariadb-test-run.pl usr/share/mysql/mysql-test/mtr
-usr/share/mysql/mysql-test/mariadb-test-run.pl usr/share/mysql/mysql-test/mysql-test-run
usr/share/mysql/mysql-test/mariadb-test-run.pl usr/share/mysql/mysql-test/mysql-test-run.pl
diff --git a/debian/not-installed b/debian/not-installed
index 92b6584ee73..9584dfe373b 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,53 +1,185 @@
etc/columnstore/storagemanager.cnf.example # Copy of etc/columnstore/storagemanager.cnf that is installed
+etc/logrotate.d/mysql # Debian packaging uses mariadb-server.mysql-server.logrotate
+etc/my.cnf # Debian packaging has /etc/mysql/my.cnf, which is a symlink to mariadb.cnf
+etc/mysql/mariadb.conf.d/client.cnf # Debian packaging uses files from debian/additions/mariadb.cnf.d/
+etc/mysql/mariadb.conf.d/enable_encryption.preset # Debian packaging uses files from debian/additions/mariadb.cnf.d/
+etc/mysql/mariadb.conf.d/mysql-clients.cnf # Debian packaging uses files from debian/additions/mariadb.cnf.d/
+etc/mysql/mariadb.conf.d/server.cnf # Debian packaging uses files from debian/additions/mariadb.cnf.d/
+lib/systemd/system/mariadb-extra.socket # Installed by rules file
+lib/systemd/system/mariadb-extra@.socket # Installed by rules file
lib/systemd/system/mariadb.service # Installed by rules file
lib/systemd/system/mariadb.socket # Installed by rules file
-lib/systemd/system/mariadb-extra.socket # Installed by rules file
lib/systemd/system/mariadb@.service # Installed by rules file
lib/systemd/system/mariadb@.socket # Installed by rules file
-lib/systemd/system/mariadb-extra@.socket # Installed by rules file
-usr/bin/mysql_config # We already have the MariaDB variant
-usr/bin/mytop # Mytop is distributed from a separate source package
+usr/bin/mariadb-embedded # Shipping the embedded server in distro packaging does not make sense
+usr/bin/mysql_config # Debian packaging has mysql_config as symlink to mariadb_config
+usr/bin/mysql_embedded # Symlink to mariadb-embeded which is intentionally not included
usr/bin/sst_dump # Use the one from rocksdb-tools package
-usr/lib/mysql/plugin/JavaWrappers.jar # These are only built if JNI/libjawt.so is installed from e.g. openjdk-8-jre-headless
-usr/lib/mysql/plugin/JdbcInterface.jar # These are only built if JNI/libjawt.so is installed from e.g. openjdk-8-jre-headless
-usr/lib/sysusers.d/sysusers.conf
-usr/lib/tmpfiles.d/tmpfiles.conf
usr/lib/*/libdbbc.a # ColumnStore header file
usr/lib/*/libidbboot.a # ColumnStore header file
usr/lib/*/libprocessor.a # ColumnStore header file
usr/lib/*/libwe_xml.a # ColumnStore header file
-usr/share/doc/mariadb-server-10.9/COPYING
-usr/share/doc/mariadb-server-10.9/COPYING.AGPLv3
-usr/share/doc/mariadb-server-10.9/COPYING.GPLv2
-usr/share/doc/mariadb-server-10.9/COPYING.thirdparty
+usr/bin/test-connect-t
+usr/bin/wsrep_sst_backup
+usr/lib/mysql/plugin/type_test.so
+usr/lib/sysusers.d/mariadb.conf # Not used (yet) in Debian systemd
+usr/lib/tmpfiles.d/mariadb.conf # Not used (yet) in Debian systemd
+usr/sbin/rcmysql
+usr/share/doc/mariadb-server-10.9/COPYING (related file: "debian/tmp/usr/share/mysql/mroonga/COPYING")
usr/share/doc/mariadb-server-10.9/CREDITS
-usr/share/doc/mariadb-server-10.9/EXCEPTIONS-CLIENT
usr/share/doc/mariadb-server-10.9/INSTALL-BINARY
-usr/share/doc/mariadb-server-10.9/PATENTS
usr/share/doc/mariadb-server-10.9/README-wsrep
-usr/share/groonga/COPYING
-usr/share/groonga-normalizer-mysql/lgpl-2.0.txt
+usr/share/doc/mariadb-server-10.9/README.md
+usr/share/doc/mariadb-server-10.9/THIRDPARTY
usr/share/groonga-normalizer-mysql/README.md
+usr/share/groonga-normalizer-mysql/lgpl-2.0.txt
+usr/share/groonga/COPYING
usr/share/groonga/README.md
+usr/share/man/man1/mariadb-embedded.1 # Shipping the embedded server in distro packaging does not make sense
+usr/share/man/man1/mysql_embedded.1 # Symlink to mariadb-embeded.1 which is intentionally not included
usr/share/man/man1/my_safe_process.1
+usr/share/man/man1/mysql-stress-test.pl.1
usr/share/man/man1/mysql.server.1
+usr/share/man/man3/mariadb_cancel.3
+usr/share/man/man3/mariadb_connection.3
+usr/share/man/man3/mariadb_dyncol_check.3
+usr/share/man/man3/mariadb_dyncol_column_cmp_named.3
+usr/share/man/man3/mariadb_dyncol_column_count.3
+usr/share/man/man3/mariadb_dyncol_create_many_named.3
+usr/share/man/man3/mariadb_dyncol_create_many_num.3
+usr/share/man/man3/mariadb_dyncol_exists_named.3
+usr/share/man/man3/mariadb_dyncol_exists_num.3
+usr/share/man/man3/mariadb_dyncol_free.3
+usr/share/man/man3/mariadb_dyncol_list_named.3
+usr/share/man/man3/mariadb_dyncol_list_num.3
+usr/share/man/man3/mariadb_dyncol_unpack.3
+usr/share/man/man3/mariadb_dyncol_update_many_named.3
+usr/share/man/man3/mariadb_dyncol_update_many_num.3
+usr/share/man/man3/mariadb_get_infov.3
+usr/share/man/man3/mariadb_reconnect.3
+usr/share/man/man3/mariadb_rpl_close.3
+usr/share/man/man3/mariadb_rpl_fetch.3
+usr/share/man/man3/mariadb_rpl_get_optionsv.3
+usr/share/man/man3/mariadb_rpl_open.3
+usr/share/man/man3/mariadb_rpl_optionsv.3
+usr/share/man/man3/mariadb_stmt_execute_direct.3
+usr/share/man/man3/mariadb_stmt_fetch_fields.3
+usr/share/man/man3/mysql_affected_rows.3
+usr/share/man/man3/mysql_autocommit.3
+usr/share/man/man3/mysql_change_user.3
+usr/share/man/man3/mysql_close.3
+usr/share/man/man3/mysql_commit.3
+usr/share/man/man3/mysql_data_seek.3
+usr/share/man/man3/mysql_errno.3
+usr/share/man/man3/mysql_error.3
+usr/share/man/man3/mysql_fetch_field.3
+usr/share/man/man3/mysql_fetch_field_direct.3
+usr/share/man/man3/mysql_fetch_fields.3
+usr/share/man/man3/mysql_fetch_lengths.3
+usr/share/man/man3/mysql_fetch_row.3
+usr/share/man/man3/mysql_field_count.3
+usr/share/man/man3/mysql_field_seek.3
+usr/share/man/man3/mysql_field_tell.3
+usr/share/man/man3/mysql_free_result.3
+usr/share/man/man3/mysql_get_character_set_info.3
+usr/share/man/man3/mysql_get_client_info.3
+usr/share/man/man3/mysql_get_client_version.3
+usr/share/man/man3/mysql_get_host_info.3
+usr/share/man/man3/mysql_get_proto_info.3
+usr/share/man/man3/mysql_get_server_info.3
+usr/share/man/man3/mysql_get_server_version.3
+usr/share/man/man3/mysql_get_socket.3
+usr/share/man/man3/mysql_get_ssl_cipher.3
+usr/share/man/man3/mysql_hex_string.3
+usr/share/man/man3/mysql_info.3
+usr/share/man/man3/mysql_init.3
+usr/share/man/man3/mysql_kill.3
+usr/share/man/man3/mysql_more_results.3
+usr/share/man/man3/mysql_next_result.3
+usr/share/man/man3/mysql_num_fields.3
+usr/share/man/man3/mysql_num_rows.3
+usr/share/man/man3/mysql_options.3
+usr/share/man/man3/mysql_options4.3
+usr/share/man/man3/mysql_optionsv.3
+usr/share/man/man3/mysql_ping.3
+usr/share/man/man3/mysql_query.3
+usr/share/man/man3/mysql_read_query_result.3
+usr/share/man/man3/mysql_real_connect.3
+usr/share/man/man3/mysql_real_escape_string.3
+usr/share/man/man3/mysql_real_query.3
+usr/share/man/man3/mysql_refresh.3
+usr/share/man/man3/mysql_reset_connection.3
+usr/share/man/man3/mysql_rollback.3
+usr/share/man/man3/mysql_row_seek.3
+usr/share/man/man3/mysql_row_tell.3
+usr/share/man/man3/mysql_select_db.3
+usr/share/man/man3/mysql_send_query.3
+usr/share/man/man3/mysql_server_end.3
+usr/share/man/man3/mysql_server_init.3
+usr/share/man/man3/mysql_session_track_get_first.3
+usr/share/man/man3/mysql_session_track_get_next.3
+usr/share/man/man3/mysql_set_character_set.3
+usr/share/man/man3/mysql_set_server_option.3
+usr/share/man/man3/mysql_shutdown.3
+usr/share/man/man3/mysql_sqlstate.3
+usr/share/man/man3/mysql_ssl_set.3
+usr/share/man/man3/mysql_stat.3
+usr/share/man/man3/mysql_stmt_affected_rows.3
+usr/share/man/man3/mysql_stmt_attr_get.3
+usr/share/man/man3/mysql_stmt_attr_set.3
+usr/share/man/man3/mysql_stmt_bind_param.3
+usr/share/man/man3/mysql_stmt_bind_result.3
+usr/share/man/man3/mysql_stmt_close.3
+usr/share/man/man3/mysql_stmt_data_seek.3
+usr/share/man/man3/mysql_stmt_errno.3
+usr/share/man/man3/mysql_stmt_error.3
+usr/share/man/man3/mysql_stmt_execute.3
+usr/share/man/man3/mysql_stmt_fetch.3
+usr/share/man/man3/mysql_stmt_fetch_column.3
+usr/share/man/man3/mysql_stmt_field_count.3
+usr/share/man/man3/mysql_stmt_free_result.3
+usr/share/man/man3/mysql_stmt_init.3
+usr/share/man/man3/mysql_stmt_insert_id.3
+usr/share/man/man3/mysql_stmt_more_results.3
+usr/share/man/man3/mysql_stmt_next_result.3
+usr/share/man/man3/mysql_stmt_num_rows.3
+usr/share/man/man3/mysql_stmt_param_count.3
+usr/share/man/man3/mysql_stmt_param_metadata.3
+usr/share/man/man3/mysql_stmt_prepare.3
+usr/share/man/man3/mysql_stmt_reset.3
+usr/share/man/man3/mysql_stmt_result_metadata.3
+usr/share/man/man3/mysql_stmt_row_seek.3
+usr/share/man/man3/mysql_stmt_row_tell.3
+usr/share/man/man3/mysql_stmt_send_long_data.3
+usr/share/man/man3/mysql_stmt_sqlstate.3
+usr/share/man/man3/mysql_stmt_store_result.3
+usr/share/man/man3/mysql_stmt_warning_count.3
+usr/share/man/man3/mysql_store_result.3
+usr/share/man/man3/mysql_thread_end.3
+usr/share/man/man3/mysql_thread_id.3
+usr/share/man/man3/mysql_thread_init.3
+usr/share/man/man3/mysql_use_result.3
+usr/share/man/man3/mysql_warning_count.3
usr/share/mysql/binary-configure
usr/share/mysql/magic
-usr/share/mysql/maria_add_gis_sp.sql
+usr/share/mysql/maria_add_gis_sp.sql # mariadb-server-core.install has *_bootstrap.sql
+usr/share/mysql/mysql-log-rotate # Debian packaging uses mariadb-server.mysql-server.logrotate
+usr/share/mysql/mysql-test/asan.supp
+usr/share/mysql/mysql-test/lsan.supp
+usr/share/mysql/mysql-test/unstable-tests
+usr/share/mysql/mysql.server # Debian packaging uses mariadb-server.mariadb.init
usr/share/mysql/mysqld_multi.server
-usr/share/mysql/mysql-log-rotate
-usr/share/mysql/mysql.server
-usr/share/mysql/mysql-test/mtr # Already created by mariadb-test.links
-usr/share/mysql/mysql-test/mysql-test-run # Already created by mariadb-test.links
-usr/share/mysql/mysql_to_mariadb.sql
usr/share/mysql/policy/apparmor/README # In MariaDB we don't want to use AppArmor at the moment
usr/share/mysql/policy/apparmor/usr.sbin.mysqld # In MariaDB we don't want to use AppArmor at the moment
usr/share/mysql/policy/apparmor/usr.sbin.mysqld.local # In MariaDB we don't want to use AppArmor at the moment
+usr/share/mysql/policy/selinux/README # In MariaDB we don't want to use SELinux at the moment
usr/share/mysql/policy/selinux/mariadb-server.fc # In MariaDB we don't want to use SELinux at the moment
usr/share/mysql/policy/selinux/mariadb-server.te # In MariaDB we don't want to use SELinux at the moment
usr/share/mysql/policy/selinux/mariadb.te # In MariaDB we don't want to use SELinux at the moment
-usr/share/mysql/policy/selinux/README # In MariaDB we don't want to use SELinux at the moment
+usr/share/mysql/systemd/mariadb-extra@.socket # Installed by rules file
usr/share/mysql/systemd/mariadb.service # Installed by rules file
usr/share/mysql/systemd/mariadb@.service # Installed by rules file
+usr/share/mysql/systemd/mariadb@.socket # Installed by rules file
+usr/share/mysql/systemd/mysql.service # Installed by rules file
+usr/share/mysql/systemd/mysqld.service # Installed by rules file
usr/share/mysql/systemd/use_galera_new_cluster.conf
-usr/share/mysql/wsrep.cnf
diff --git a/debian/rules b/debian/rules
index 814c7e8494f..660797f3c2b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -215,6 +215,6 @@ override_dh_gencontrol:
# white list file only starting from Debian Stretch and Ubuntu Xenial.
# To find more, grep build logs for 'but is not installed to anywhere'.
%:
- dh $@ --parallel --with systemd --list-missing
+ dh $@ --parallel --with systemd --fail-missing
# vim: ts=8