Commit b464b999 authored by Otto Kekäläinen's avatar Otto Kekäläinen

MDEV-17367: Move my_print_defaults and *.sql to mariadb-server-core

The command is needed to install/upgrade databases. It should therefore
reside in the server-core package, as that package is supposed to contain
all necessary tools to start and run the database (although manually,
there are no automation or service scripts included in server-core by
design).

Also add Breaks+Replaces in the control so upgrades will not complain about
overwriting files in previously installed packages of different name.

This was adopted from Debian where this change has been since Nov 4, 2018.
https://salsa.debian.org/mariadb-team/mariadb-10.1/-/commit/3689350ad30916aa68fe2c1b35c290fb5095bc9b

In addition, also move all *.sql files referenced mysql_install_db for
the same reasons.
parent 4b42fa3c
...@@ -396,7 +396,8 @@ Breaks: mariadb-client-10.0, ...@@ -396,7 +396,8 @@ Breaks: mariadb-client-10.0,
mariadb-client-10.3, mariadb-client-10.3,
mariadb-client-10.4, mariadb-client-10.4,
mariadb-server-10.3, mariadb-server-10.3,
mariadb-server-10.4 mariadb-server-10.4,
mariadb-server-10.5 (<< ${source:Version})
Replaces: mariadb-client-10.0, Replaces: mariadb-client-10.0,
mariadb-client-10.1, mariadb-client-10.1,
mariadb-client-10.2, mariadb-client-10.2,
...@@ -404,6 +405,7 @@ Replaces: mariadb-client-10.0, ...@@ -404,6 +405,7 @@ Replaces: mariadb-client-10.0,
mariadb-client-10.4, mariadb-client-10.4,
mariadb-server-10.3, mariadb-server-10.3,
mariadb-server-10.4, mariadb-server-10.4,
mariadb-server-10.5 (<< ${source:Version}),
mariadb-server-core-10.0, mariadb-server-core-10.0,
mariadb-server-core-10.1, mariadb-server-core-10.1,
mariadb-server-core-10.2, mariadb-server-core-10.2,
......
...@@ -16,7 +16,6 @@ usr/bin/galera_new_cluster ...@@ -16,7 +16,6 @@ usr/bin/galera_new_cluster
usr/bin/galera_recovery usr/bin/galera_recovery
usr/bin/mariadb-service-convert usr/bin/mariadb-service-convert
usr/bin/msql2mysql usr/bin/msql2mysql
usr/bin/my_print_defaults
usr/bin/myisam_ftdump usr/bin/myisam_ftdump
usr/bin/myisamchk usr/bin/myisamchk
usr/bin/myisamlog usr/bin/myisamlog
...@@ -79,7 +78,6 @@ usr/share/man/man1/mariadbd-multi.1 ...@@ -79,7 +78,6 @@ usr/share/man/man1/mariadbd-multi.1
usr/share/man/man1/mariadbd-safe-helper.1 usr/share/man/man1/mariadbd-safe-helper.1
usr/share/man/man1/mariadbd-safe.1 usr/share/man/man1/mariadbd-safe.1
usr/share/man/man1/msql2mysql.1 usr/share/man/man1/msql2mysql.1
usr/share/man/man1/my_print_defaults.1
usr/share/man/man1/myisam_ftdump.1 usr/share/man/man1/myisam_ftdump.1
usr/share/man/man1/myisamchk.1 usr/share/man/man1/myisamchk.1
usr/share/man/man1/myisamlog.1 usr/share/man/man1/myisamlog.1
...@@ -103,11 +101,5 @@ usr/share/man/man1/wsrep_sst_mariabackup.1 ...@@ -103,11 +101,5 @@ usr/share/man/man1/wsrep_sst_mariabackup.1
usr/share/man/man1/wsrep_sst_mysqldump.1 usr/share/man/man1/wsrep_sst_mysqldump.1
usr/share/man/man1/wsrep_sst_rsync.1 usr/share/man/man1/wsrep_sst_rsync.1
usr/share/mysql/errmsg-utf8.txt usr/share/mysql/errmsg-utf8.txt
usr/share/mysql/fill_help_tables.sql
usr/share/mysql/maria_add_gis_sp_bootstrap.sql
usr/share/mysql/mysql_performance_tables.sql
usr/share/mysql/mysql_system_tables.sql
usr/share/mysql/mysql_system_tables_data.sql
usr/share/mysql/mysql_test_data_timezone.sql usr/share/mysql/mysql_test_data_timezone.sql
usr/share/mysql/mysql_test_db.sql
usr/share/mysql/wsrep_notify usr/share/mysql/wsrep_notify
usr/bin/innochecksum usr/bin/innochecksum
usr/bin/my_print_defaults
usr/bin/mysql_install_db usr/bin/mysql_install_db
usr/bin/mysql_upgrade usr/bin/mysql_upgrade
usr/sbin/mysqld usr/sbin/mysqld
usr/share/man/man1/innochecksum.1 usr/share/man/man1/innochecksum.1
usr/share/man/man1/mariadb-install-db.1 usr/share/man/man1/mariadb-install-db.1
usr/share/man/man1/mariadb-upgrade.1 usr/share/man/man1/mariadb-upgrade.1
usr/share/man/man1/my_print_defaults.1
usr/share/man/man1/mysql_install_db.1 usr/share/man/man1/mysql_install_db.1
usr/share/man/man1/mysql_upgrade.1 usr/share/man/man1/mysql_upgrade.1
usr/share/man/man8/mariadbd.8 usr/share/man/man8/mariadbd.8
...@@ -15,6 +17,7 @@ usr/share/mysql/danish ...@@ -15,6 +17,7 @@ usr/share/mysql/danish
usr/share/mysql/dutch usr/share/mysql/dutch
usr/share/mysql/english usr/share/mysql/english
usr/share/mysql/estonian usr/share/mysql/estonian
usr/share/mysql/fill_help_tables.sql
usr/share/mysql/french usr/share/mysql/french
usr/share/mysql/german usr/share/mysql/german
usr/share/mysql/greek usr/share/mysql/greek
...@@ -23,6 +26,11 @@ usr/share/mysql/hungarian ...@@ -23,6 +26,11 @@ usr/share/mysql/hungarian
usr/share/mysql/italian usr/share/mysql/italian
usr/share/mysql/japanese usr/share/mysql/japanese
usr/share/mysql/korean usr/share/mysql/korean
usr/share/mysql/maria_add_gis_sp_bootstrap.sql
usr/share/mysql/mysql_performance_tables.sql
usr/share/mysql/mysql_system_tables.sql
usr/share/mysql/mysql_system_tables_data.sql
usr/share/mysql/mysql_test_db.sql
usr/share/mysql/norwegian usr/share/mysql/norwegian
usr/share/mysql/norwegian-ny usr/share/mysql/norwegian-ny
usr/share/mysql/polish usr/share/mysql/polish
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment