diff options
Diffstat (limited to 'debian')
| -rwxr-xr-x | debian/additions/mariadb-report | 2 | ||||
| -rw-r--r-- | debian/mariadb-plugin-columnstore.install | 1 | ||||
| -rw-r--r-- | debian/mariadb-server-10.6.install | 1 | ||||
| -rw-r--r-- | debian/mariadb-server-10.6.mysql-server.logrotate | 2 | ||||
| -rw-r--r-- | debian/mariadb-server-10.6.postinst | 13 | ||||
| -rw-r--r-- | debian/mariadb-test.install | 1 | ||||
| -rwxr-xr-x | debian/rules | 1 |
7 files changed, 19 insertions, 2 deletions
diff --git a/debian/additions/mariadb-report b/debian/additions/mariadb-report index 206aaefb2f8..5c9761e0710 100755 --- a/debian/additions/mariadb-report +++ b/debian/additions/mariadb-report @@ -1,4 +1,4 @@ -#!/usr/bin/env perl -w +#!/usr/bin/perl # mariadb-report v4.0 Oct 23 2015 # renamed to from mysqlreport in 2020 diff --git a/debian/mariadb-plugin-columnstore.install b/debian/mariadb-plugin-columnstore.install index 3b4c9619dc6..f519fa2a37e 100644 --- a/debian/mariadb-plugin-columnstore.install +++ b/debian/mariadb-plugin-columnstore.install @@ -55,6 +55,7 @@ usr/bin/mariadb-columnstore-start.sh usr/bin/mariadb-columnstore-stop.sh usr/bin/mariadb-command-line.sh usr/bin/master-rep-columnstore.sh +usr/bin/mcs-savebrm.py usr/bin/mcs-loadbrm.py usr/bin/mcs-stop-controllernode.sh usr/bin/mcsGetConfig diff --git a/debian/mariadb-server-10.6.install b/debian/mariadb-server-10.6.install index 883c0b9f0aa..f0c644482cd 100644 --- a/debian/mariadb-server-10.6.install +++ b/debian/mariadb-server-10.6.install @@ -61,6 +61,7 @@ usr/lib/mysql/plugin/query_response_time.so usr/lib/mysql/plugin/server_audit.so usr/lib/mysql/plugin/simple_password_check.so usr/lib/mysql/plugin/sql_errlog.so +usr/lib/mysql/plugin/type_mysql_json.so usr/lib/mysql/plugin/wsrep_info.so usr/share/doc/mariadb-server-10.6/mariadbd.sym.gz usr/share/man/man1/aria_chk.1 diff --git a/debian/mariadb-server-10.6.mysql-server.logrotate b/debian/mariadb-server-10.6.mysql-server.logrotate index eed6fc5e88d..4111a276dc3 100644 --- a/debian/mariadb-server-10.6.mysql-server.logrotate +++ b/debian/mariadb-server-10.6.mysql-server.logrotate @@ -11,7 +11,7 @@ sharedscripts postrotate test -x /usr/bin/mysqladmin || exit 0 - if [ -f `my_print_defaults --mariadbd | grep -oP "pid-file=\K[^$]+"` ]; then + if [ -f `my_print_defaults --mysqld | grep -oP "pid-file=\K[^$]+"` ]; then # If this fails, check debian.conf! mysqladmin --defaults-file=/etc/mysql/debian.cnf --local flush-error-log \ flush-engine-log flush-general-log flush-slow-log diff --git a/debian/mariadb-server-10.6.postinst b/debian/mariadb-server-10.6.postinst index 6decee78766..c29b3532cb2 100644 --- a/debian/mariadb-server-10.6.postinst +++ b/debian/mariadb-server-10.6.postinst @@ -103,6 +103,19 @@ EOF rmdir $mysql_upgradedir 2>/dev/null || true done + # Upgrading from mysql.com needs might have the root user as auth_socket. + # auto.cnf is a sign of a mysql install, that doesn't exist in mariadb. + # We use lsof to protect against concurrent access by mysqld (mariadb has + # its own projection). We make sure we're not doing this on a MySQL-8.0 + # directory. + # This direct update is needed to enable an authentication mechanism to + # perform mariadb-upgrade, (MDEV-22678). To keep the impact minimal, we + # skip innodb and set key-buffer-size to 0 as it isn't reused. + if [ -f "$mysql_datadir"/auto.cnf ] && [ -f "$mysql_datadir"/mysql/user.MYD ] && + [ ! lsof -nt "$mysql_datadir"/mysql/user.MYD > /dev/null ] && [ ! -f "$mysql_datadir"/undo_001 ]; then + echo "UPDATE mysql.user SET plugin='unix_socket' WHERE plugin='auth_socket';" | + /usr/sbin/mariadbd --skip-innodb --key_buffer_size=0 --default-storage-engine=MyISAM --bootstrap 2> /dev/null + fi # Ensure the existence and right permissions for the database and # log files. Use mkdir option 'Z' to create with correct SELinux context. diff --git a/debian/mariadb-test.install b/debian/mariadb-test.install index 767ec1ce587..56947ac78ef 100644 --- a/debian/mariadb-test.install +++ b/debian/mariadb-test.install @@ -8,6 +8,7 @@ usr/lib/*/libmariadb3/plugin/qa_auth_interface.so usr/lib/mysql/plugin/adt_null.so usr/lib/mysql/plugin/auth_0x0100.so usr/lib/mysql/plugin/auth_test_plugin.so +usr/lib/mysql/plugin/test_sql_service.so usr/lib/mysql/plugin/daemon_example.ini usr/lib/mysql/plugin/debug_key_management.so usr/lib/mysql/plugin/dialog_examples.so diff --git a/debian/rules b/debian/rules index aa5c7b1b6e0..686c1c5e3dd 100755 --- a/debian/rules +++ b/debian/rules @@ -165,6 +165,7 @@ endif # load from the libmariadb path as well ln -s ../../../mysql/plugin/auth_test_plugin.so $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadb3/plugin/auth_test_plugin.so ln -s ../../../mysql/plugin/qa_auth_interface.so $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadb3/plugin/qa_auth_interface.so + ln -s ../../../mysql/plugin/test_sql_service.so $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadb3/plugin/test_sql_service.so # Move test plugins that are only needed by the client to the libmariadb path mv -v $(TMP)/usr/lib/mysql/plugin/qa_auth_client.so $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadb3/plugin/ |