Commit b4a5e7b2 authored by Otto Kekäläinen's avatar Otto Kekäläinen
Browse files

Update MariaDB Server API version from 18 to 19

parent 37bc1a49
...@@ -152,7 +152,7 @@ Multi-Arch: same ...@@ -152,7 +152,7 @@ Multi-Arch: same
Section: libdevel Section: libdevel
Pre-Depends: ${misc:Pre-Depends} Pre-Depends: ${misc:Pre-Depends}
Depends: libmariadbclient-dev (= ${binary:Version}), Depends: libmariadbclient-dev (= ${binary:Version}),
libmariadbd18 (= ${binary:Version}), libmariadbd19 (= ${binary:Version}),
${misc:Depends}, ${misc:Depends},
${shlibs:Depends} ${shlibs:Depends}
Breaks: libmysqld-dev Breaks: libmysqld-dev
......
usr/lib/*/libmysqld.so.* usr/lib/*/libmariadbd.so.*
# OK as the MariaDB package is not anyway allowed to use MySQL name
libmariadbd18: package-name-doesnt-match-sonames libmysqld18
etc/mysql/conf.d/connect.cnf etc/mysql/conf.d/connect.cnf
usr/lib/*/mariadb18/plugin/ha_connect.so usr/lib/*/mariadb19/plugin/ha_connect.so
etc/mysql/conf.d/cracklib_password_check.cnf etc/mysql/mariadb.conf.d etc/mysql/conf.d/cracklib_password_check.cnf etc/mysql/mariadb.conf.d
usr/lib/*/mariadb18/plugin/cracklib_password_check.so usr/lib/*/mariadb19/plugin/cracklib_password_check.so
usr/lib/*/mariadb18/plugin/auth_gssapi_client.so usr/lib/*/mariadb19/plugin/auth_gssapi_client.so
etc/mysql/conf.d/auth_gssapi.cnf etc/mysql/mariadb.conf.d etc/mysql/conf.d/auth_gssapi.cnf etc/mysql/mariadb.conf.d
usr/lib/*/mariadb18/plugin/auth_gssapi.so usr/lib/*/mariadb19/plugin/auth_gssapi.so
usr/lib/*/mariadb18/plugin/ha_mroonga.so usr/lib/*/mariadb19/plugin/ha_mroonga.so
usr/share/mysql/mroonga/install.sql usr/share/mysql/mroonga/install.sql
usr/share/mysql/mroonga/uninstall.sql usr/share/mysql/mroonga/uninstall.sql
etc/mysql/conf.d/oqgraph.cnf etc/mysql/mariadb.conf.d etc/mysql/conf.d/oqgraph.cnf etc/mysql/mariadb.conf.d
usr/lib/*/mariadb18/plugin/ha_oqgraph.so usr/lib/*/mariadb19/plugin/ha_oqgraph.so
usr/lib/*/mariadb18/plugin/ha_spider.so usr/lib/*/mariadb19/plugin/ha_spider.so
usr/share/mysql/install_spider.sql usr/share/mysql/install_spider.sql
etc/mysql/conf.d/tokudb.cnf etc/mysql/mariadb.conf.d etc/mysql/conf.d/tokudb.cnf etc/mysql/mariadb.conf.d
usr/bin/tokuft_logprint usr/bin/tokuft_logprint
usr/bin/tokuftdump usr/bin/tokuftdump
usr/lib/*/mariadb18/plugin/ha_tokudb.so usr/lib/*/mariadb19/plugin/ha_tokudb.so
usr/share/doc/mariadb-server-10.3/README.md usr/share/doc/mariadb-plugin-tokudb/README.md usr/share/doc/mariadb-server-10.3/README.md usr/share/doc/mariadb-plugin-tokudb/README.md
usr/share/man/man1/tokuft_logprint.1 usr/share/man/man1/tokuft_logprint.1
usr/share/man/man1/tokuftdump.1 usr/share/man/man1/tokuftdump.1
...@@ -45,26 +45,26 @@ usr/bin/wsrep_sst_rsync ...@@ -45,26 +45,26 @@ usr/bin/wsrep_sst_rsync
usr/bin/wsrep_sst_rsync_wan usr/bin/wsrep_sst_rsync_wan
usr/bin/wsrep_sst_xtrabackup usr/bin/wsrep_sst_xtrabackup
usr/bin/wsrep_sst_xtrabackup-v2 usr/bin/wsrep_sst_xtrabackup-v2
usr/lib/*/mariadb18/plugin/auth_ed25519.so usr/lib/*/mariadb19/plugin/auth_ed25519.so
usr/lib/*/mariadb18/plugin/auth_pam.so usr/lib/*/mariadb19/plugin/auth_pam.so
usr/lib/*/mariadb18/plugin/file_key_management.so usr/lib/*/mariadb19/plugin/file_key_management.so
usr/lib/*/mariadb18/plugin/ha_archive.so usr/lib/*/mariadb19/plugin/ha_archive.so
usr/lib/*/mariadb18/plugin/ha_blackhole.so usr/lib/*/mariadb19/plugin/ha_blackhole.so
usr/lib/*/mariadb18/plugin/ha_federated.so usr/lib/*/mariadb19/plugin/ha_federated.so
usr/lib/*/mariadb18/plugin/ha_federatedx.so usr/lib/*/mariadb19/plugin/ha_federatedx.so
usr/lib/*/mariadb18/plugin/ha_innodb.so usr/lib/*/mariadb19/plugin/ha_innodb.so
usr/lib/*/mariadb18/plugin/ha_sphinx.so usr/lib/*/mariadb19/plugin/ha_sphinx.so
usr/lib/*/mariadb18/plugin/handlersocket.so usr/lib/*/mariadb19/plugin/handlersocket.so
usr/lib/*/mariadb18/plugin/locales.so usr/lib/*/mariadb19/plugin/locales.so
usr/lib/*/mariadb18/plugin/metadata_lock_info.so usr/lib/*/mariadb19/plugin/metadata_lock_info.so
usr/lib/*/mariadb18/plugin/query_cache_info.so usr/lib/*/mariadb19/plugin/query_cache_info.so
usr/lib/*/mariadb18/plugin/query_response_time.so usr/lib/*/mariadb19/plugin/query_response_time.so
usr/lib/*/mariadb18/plugin/semisync_master.so usr/lib/*/mariadb19/plugin/semisync_master.so
usr/lib/*/mariadb18/plugin/semisync_slave.so usr/lib/*/mariadb19/plugin/semisync_slave.so
usr/lib/*/mariadb18/plugin/server_audit.so usr/lib/*/mariadb19/plugin/server_audit.so
usr/lib/*/mariadb18/plugin/simple_password_check.so usr/lib/*/mariadb19/plugin/simple_password_check.so
usr/lib/*/mariadb18/plugin/sql_errlog.so usr/lib/*/mariadb19/plugin/sql_errlog.so
usr/lib/*/mariadb18/plugin/wsrep_info.so usr/lib/*/mariadb19/plugin/wsrep_info.so
usr/share/doc/mariadb-server-10.3/mysqld.sym.gz usr/share/doc/mariadb-server-10.3/mysqld.sym.gz
usr/share/mysql/errmsg-utf8.txt usr/share/mysql/errmsg-utf8.txt
usr/share/mysql/fill_help_tables.sql usr/share/mysql/fill_help_tables.sql
......
...@@ -3,4 +3,4 @@ mariadb-server-10.3: command-with-path-in-maintainer-script postinst:140 /bin/ec ...@@ -3,4 +3,4 @@ mariadb-server-10.3: command-with-path-in-maintainer-script postinst:140 /bin/ec
# OK, path /usr/sbin/invoke-rc.d is only used in check, executes are run without the path # OK, path /usr/sbin/invoke-rc.d is only used in check, executes are run without the path
# False positive: unfortified calls have already been fully validated at compile-time # False positive: unfortified calls have already been fully validated at compile-time
# See full research at https://jira.mariadb.org/browse/MDEV-8377 # See full research at https://jira.mariadb.org/browse/MDEV-8377
mariadb-server-10.3: hardening-no-fortify-functions usr/lib/*/mariadb18/plugin/auth_pam.so mariadb-server-10.3: hardening-no-fortify-functions usr/lib/*/mariadb19/plugin/auth_pam.so
...@@ -86,7 +86,7 @@ override_dh_auto_configure: ...@@ -86,7 +86,7 @@ override_dh_auto_configure:
-DCMAKE_SYSTEM_PROCESSOR=$(DEB_HOST_ARCH) \ -DCMAKE_SYSTEM_PROCESSOR=$(DEB_HOST_ARCH) \
-DBUILD_CONFIG=mysql_release \ -DBUILD_CONFIG=mysql_release \
-DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \ -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
-DINSTALL_PLUGINDIR=lib/$(DEB_HOST_MULTIARCH)/mariadb18/plugin \ -DINSTALL_PLUGINDIR=lib/$(DEB_HOST_MULTIARCH)/mariadb19/plugin \
-DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test \ -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test \
-DPLUGIN_AUTH_SOCKET=STATIC \ -DPLUGIN_AUTH_SOCKET=STATIC \
-DDEB=$(DEB_VENDOR) ..' -DDEB=$(DEB_VENDOR) ..'
...@@ -129,20 +129,20 @@ endif ...@@ -129,20 +129,20 @@ endif
rm -rf $(TMP)/usr/share/mysql/mysql-test/plugin/tokudb/tokudb/t/*.py rm -rf $(TMP)/usr/share/mysql/mysql-test/plugin/tokudb/tokudb/t/*.py
# Remove test plugins # Remove test plugins
rm -f $(TMP)/usr/lib/*/mariadb18/plugin/adt_null.so rm -f $(TMP)/usr/lib/*/mariadb19/plugin/adt_null.so
rm -f $(TMP)/usr/lib/*/mariadb18/plugin/auth_0x0100.so rm -f $(TMP)/usr/lib/*/mariadb19/plugin/auth_0x0100.so
rm -f $(TMP)/usr/lib/*/mariadb18/plugin/auth_test_plugin.so rm -f $(TMP)/usr/lib/*/mariadb19/plugin/auth_test_plugin.so
rm -f $(TMP)/usr/lib/*/mariadb18/plugin/daemon_example.ini rm -f $(TMP)/usr/lib/*/mariadb19/plugin/daemon_example.ini
rm -f $(TMP)/usr/lib/*/mariadb18/plugin/debug_key_management.so rm -f $(TMP)/usr/lib/*/mariadb19/plugin/debug_key_management.so
rm -f $(TMP)/usr/lib/*/mariadb18/plugin/dialog_examples.so rm -f $(TMP)/usr/lib/*/mariadb19/plugin/dialog_examples.so
rm -f $(TMP)/usr/lib/*/mariadb18/plugin/example_key_management.so rm -f $(TMP)/usr/lib/*/mariadb19/plugin/example_key_management.so
rm -f $(TMP)/usr/lib/*/mariadb18/plugin/ha_example.so rm -f $(TMP)/usr/lib/*/mariadb19/plugin/ha_example.so
rm -f $(TMP)/usr/lib/*/mariadb18/plugin/ha_test_sql_discovery.so rm -f $(TMP)/usr/lib/*/mariadb19/plugin/ha_test_sql_discovery.so
rm -f $(TMP)/usr/lib/*/mariadb18/plugin/libdaemon_example.so rm -f $(TMP)/usr/lib/*/mariadb19/plugin/libdaemon_example.so
rm -f $(TMP)/usr/lib/*/mariadb18/plugin/mypluglib.so rm -f $(TMP)/usr/lib/*/mariadb19/plugin/mypluglib.so
rm -f $(TMP)/usr/lib/*/mariadb18/plugin/qa_auth_client.so rm -f $(TMP)/usr/lib/*/mariadb19/plugin/qa_auth_client.so
rm -f $(TMP)/usr/lib/*/mariadb18/plugin/qa_auth_interface.so rm -f $(TMP)/usr/lib/*/mariadb19/plugin/qa_auth_interface.so
rm -f $(TMP)/usr/lib/*/mariadb18/plugin/qa_auth_server.so rm -f $(TMP)/usr/lib/*/mariadb19/plugin/qa_auth_server.so
# Delete useless systemd files introduced in upstream commit # Delete useless systemd files introduced in upstream commit
# https://github.com/MariaDB/server/commit/7bbc6c14d1e8fcf1f4737e0a5fcf6237fe18bd23 # https://github.com/MariaDB/server/commit/7bbc6c14d1e8fcf1f4737e0a5fcf6237fe18bd23
......
Supports Markdown
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