mariadb: update to 10.5.4

3 files changed, 110 insertions, 79 deletions

diff --git a/mariadb/.footprint b/mariadb/.footprint
index 265a58891..2d6733291 100644
--- a/mariadb/.footprint
+++ b/mariadb/.footprint
@@ -4,7 +4,9 @@ drwxr-xr-x	root/root	etc/my.cnf.d/
 -rw-r--r--	root/root	etc/my.cnf.d/client.cnf
 -rw-r--r--	root/root	etc/my.cnf.d/enable_encryption.preset
 -rw-r--r--	root/root	etc/my.cnf.d/mysql-clients.cnf
+-rw-r--r--	root/root	etc/my.cnf.d/s3.cnf
 -rw-r--r--	root/root	etc/my.cnf.d/server.cnf
+-rw-r--r--	root/root	etc/my.cnf.d/spider.cnf
 drwxr-xr-x	root/root	etc/pam.d/
 -rw-r--r--	root/root	etc/pam.d/mysql
 drwxr-xr-x	root/root	etc/rc.d/
@@ -21,40 +23,42 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/aria_ftdump
 -rwxr-xr-x	root/root	usr/bin/aria_pack
 -rwxr-xr-x	root/root	usr/bin/aria_read_log
+-rwxr-xr-x	root/root	usr/bin/aria_s3_copy
 -rwxr-xr-x	root/root	usr/bin/innochecksum
--rwxr-xr-x	root/root	usr/bin/mariabackup
-lrwxrwxrwx	root/root	usr/bin/mariadb -> mysql
-lrwxrwxrwx	root/root	usr/bin/mariadb-access -> mysqlaccess
-lrwxrwxrwx	root/root	usr/bin/mariadb-admin -> mysqladmin
-lrwxrwxrwx	root/root	usr/bin/mariadb-backup -> mariabackup
-lrwxrwxrwx	root/root	usr/bin/mariadb-binlog -> mysqlbinlog
-lrwxrwxrwx	root/root	usr/bin/mariadb-check -> mysqlcheck
-lrwxrwxrwx	root/root	usr/bin/mariadb-client-test -> mysql_client_test
-lrwxrwxrwx	root/root	usr/bin/mariadb-client-test-embedded -> mysql_client_test_embedded
-lrwxrwxrwx	root/root	usr/bin/mariadb-convert-table-format -> mysql_convert_table_format
-lrwxrwxrwx	root/root	usr/bin/mariadb-dump -> mysqldump
-lrwxrwxrwx	root/root	usr/bin/mariadb-dumpslow -> mysqldumpslow
-lrwxrwxrwx	root/root	usr/bin/mariadb-embedded -> mysql_embedded
-lrwxrwxrwx	root/root	usr/bin/mariadb-find-rows -> mysql_find_rows
-lrwxrwxrwx	root/root	usr/bin/mariadb-fix-extensions -> mysql_fix_extensions
-lrwxrwxrwx	root/root	usr/bin/mariadb-hotcopy -> mysqlhotcopy
-lrwxrwxrwx	root/root	usr/bin/mariadb-import -> mysqlimport
-lrwxrwxrwx	root/root	usr/bin/mariadb-install-db -> mysql_install_db
-lrwxrwxrwx	root/root	usr/bin/mariadb-ldb -> mysql_ldb
-lrwxrwxrwx	root/root	usr/bin/mariadb-plugin -> mysql_plugin
-lrwxrwxrwx	root/root	usr/bin/mariadb-secure-installation -> mysql_secure_installation
-lrwxrwxrwx	root/root	usr/bin/mariadb-setpermission -> mysql_setpermission
-lrwxrwxrwx	root/root	usr/bin/mariadb-show -> mysqlshow
-lrwxrwxrwx	root/root	usr/bin/mariadb-slap -> mysqlslap
-lrwxrwxrwx	root/root	usr/bin/mariadb-test -> mysqltest
-lrwxrwxrwx	root/root	usr/bin/mariadb-test-embedded -> mysqltest_embedded
-lrwxrwxrwx	root/root	usr/bin/mariadb-tzinfo-to-sql -> mysql_tzinfo_to_sql
-lrwxrwxrwx	root/root	usr/bin/mariadb-upgrade -> mysql_upgrade
-lrwxrwxrwx	root/root	usr/bin/mariadb-waitpid -> mysql_waitpid
+lrwxrwxrwx	root/root	usr/bin/mariabackup -> mariadb-backup
+-rwxr-xr-x	root/root	usr/bin/mariadb
+-rwxr-xr-x	root/root	usr/bin/mariadb-access
+-rwxr-xr-x	root/root	usr/bin/mariadb-admin
+-rwxr-xr-x	root/root	usr/bin/mariadb-backup
+-rwxr-xr-x	root/root	usr/bin/mariadb-binlog
+-rwxr-xr-x	root/root	usr/bin/mariadb-check
+-rwxr-xr-x	root/root	usr/bin/mariadb-client-test
+-rwxr-xr-x	root/root	usr/bin/mariadb-client-test-embedded
+-rwxr-xr-x	root/root	usr/bin/mariadb-conv
+-rwxr-xr-x	root/root	usr/bin/mariadb-convert-table-format
+-rwxr-xr-x	root/root	usr/bin/mariadb-dump
+-rwxr-xr-x	root/root	usr/bin/mariadb-dumpslow
+-rwxr-xr-x	root/root	usr/bin/mariadb-embedded
+-rwxr-xr-x	root/root	usr/bin/mariadb-find-rows
+-rwxr-xr-x	root/root	usr/bin/mariadb-fix-extensions
+-rwxr-xr-x	root/root	usr/bin/mariadb-hotcopy
+-rwxr-xr-x	root/root	usr/bin/mariadb-import
+-rwxr-xr-x	root/root	usr/bin/mariadb-install-db
+-rwxr-xr-x	root/root	usr/bin/mariadb-ldb
+-rwxr-xr-x	root/root	usr/bin/mariadb-plugin
+-rwxr-xr-x	root/root	usr/bin/mariadb-secure-installation
+-rwxr-xr-x	root/root	usr/bin/mariadb-setpermission
+-rwxr-xr-x	root/root	usr/bin/mariadb-show
+-rwxr-xr-x	root/root	usr/bin/mariadb-slap
+-rwxr-xr-x	root/root	usr/bin/mariadb-test
+-rwxr-xr-x	root/root	usr/bin/mariadb-test-embedded
+-rwxr-xr-x	root/root	usr/bin/mariadb-tzinfo-to-sql
+-rwxr-xr-x	root/root	usr/bin/mariadb-upgrade
+-rwxr-xr-x	root/root	usr/bin/mariadb-waitpid
 -rwxr-xr-x	root/root	usr/bin/mariadb_config
-lrwxrwxrwx	root/root	usr/bin/mariadbd-multi -> mysqld_multi
-lrwxrwxrwx	root/root	usr/bin/mariadbd-safe -> mysqld_safe
-lrwxrwxrwx	root/root	usr/bin/mariadbd-safe-helper -> mysqld_safe_helper
+-rwxr-xr-x	root/root	usr/bin/mariadbd-multi
+-rwxr-xr-x	root/root	usr/bin/mariadbd-safe
+-rwxr-xr-x	root/root	usr/bin/mariadbd-safe-helper
 -rwxr-xr-x	root/root	usr/bin/mbstream
 -rwxr-xr-x	root/root	usr/bin/msql2mysql
 -rwxr-xr-x	root/root	usr/bin/my_print_defaults
@@ -63,37 +67,37 @@ lrwxrwxrwx	root/root	usr/bin/mariadbd-safe-helper -> mysqld_safe_helper
 -rwxr-xr-x	root/root	usr/bin/myisamlog
 -rwxr-xr-x	root/root	usr/bin/myisampack
 -rwxr-xr-x	root/root	usr/bin/myrocks_hotbackup
--rwxr-xr-x	root/root	usr/bin/mysql
--rwxr-xr-x	root/root	usr/bin/mysql_client_test
--rwxr-xr-x	root/root	usr/bin/mysql_client_test_embedded
+lrwxrwxrwx	root/root	usr/bin/mysql -> mariadb
+lrwxrwxrwx	root/root	usr/bin/mysql_client_test -> mariadb-client-test
+lrwxrwxrwx	root/root	usr/bin/mysql_client_test_embedded -> mariadb-client-test-embedded
 -rwxr-xr-x	root/root	usr/bin/mysql_config
--rwxr-xr-x	root/root	usr/bin/mysql_convert_table_format
--rwxr-xr-x	root/root	usr/bin/mysql_embedded
--rwxr-xr-x	root/root	usr/bin/mysql_find_rows
--rwxr-xr-x	root/root	usr/bin/mysql_fix_extensions
--rwxr-xr-x	root/root	usr/bin/mysql_install_db
--rwxr-xr-x	root/root	usr/bin/mysql_ldb
--rwxr-xr-x	root/root	usr/bin/mysql_plugin
--rwxr-xr-x	root/root	usr/bin/mysql_secure_installation
--rwxr-xr-x	root/root	usr/bin/mysql_setpermission
--rwxr-xr-x	root/root	usr/bin/mysql_tzinfo_to_sql
--rwxr-xr-x	root/root	usr/bin/mysql_upgrade
--rwxr-xr-x	root/root	usr/bin/mysql_waitpid
--rwxr-xr-x	root/root	usr/bin/mysqlaccess
--rwxr-xr-x	root/root	usr/bin/mysqladmin
--rwxr-xr-x	root/root	usr/bin/mysqlbinlog
--rwxr-xr-x	root/root	usr/bin/mysqlcheck
--rwxr-xr-x	root/root	usr/bin/mysqld_multi
--rwxr-xr-x	root/root	usr/bin/mysqld_safe
--rwxr-xr-x	root/root	usr/bin/mysqld_safe_helper
--rwxr-xr-x	root/root	usr/bin/mysqldump
--rwxr-xr-x	root/root	usr/bin/mysqldumpslow
--rwxr-xr-x	root/root	usr/bin/mysqlhotcopy
--rwxr-xr-x	root/root	usr/bin/mysqlimport
--rwxr-xr-x	root/root	usr/bin/mysqlshow
--rwxr-xr-x	root/root	usr/bin/mysqlslap
--rwxr-xr-x	root/root	usr/bin/mysqltest
--rwxr-xr-x	root/root	usr/bin/mysqltest_embedded
+lrwxrwxrwx	root/root	usr/bin/mysql_convert_table_format -> mariadb-convert-table-format
+lrwxrwxrwx	root/root	usr/bin/mysql_embedded -> mariadb-embedded
+lrwxrwxrwx	root/root	usr/bin/mysql_find_rows -> mariadb-find-rows
+lrwxrwxrwx	root/root	usr/bin/mysql_fix_extensions -> mariadb-fix-extensions
+lrwxrwxrwx	root/root	usr/bin/mysql_install_db -> mariadb-install-db
+lrwxrwxrwx	root/root	usr/bin/mysql_ldb -> mariadb-ldb
+lrwxrwxrwx	root/root	usr/bin/mysql_plugin -> mariadb-plugin
+lrwxrwxrwx	root/root	usr/bin/mysql_secure_installation -> mariadb-secure-installation
+lrwxrwxrwx	root/root	usr/bin/mysql_setpermission -> mariadb-setpermission
+lrwxrwxrwx	root/root	usr/bin/mysql_tzinfo_to_sql -> mariadb-tzinfo-to-sql
+lrwxrwxrwx	root/root	usr/bin/mysql_upgrade -> mariadb-upgrade
+lrwxrwxrwx	root/root	usr/bin/mysql_waitpid -> mariadb-waitpid
+lrwxrwxrwx	root/root	usr/bin/mysqlaccess -> mariadb-access
+lrwxrwxrwx	root/root	usr/bin/mysqladmin -> mariadb-admin
+lrwxrwxrwx	root/root	usr/bin/mysqlbinlog -> mariadb-binlog
+lrwxrwxrwx	root/root	usr/bin/mysqlcheck -> mariadb-check
+lrwxrwxrwx	root/root	usr/bin/mysqld_multi -> mariadbd-multi
+lrwxrwxrwx	root/root	usr/bin/mysqld_safe -> mariadbd-safe
+lrwxrwxrwx	root/root	usr/bin/mysqld_safe_helper -> mariadbd-safe-helper
+lrwxrwxrwx	root/root	usr/bin/mysqldump -> mariadb-dump
+lrwxrwxrwx	root/root	usr/bin/mysqldumpslow -> mariadb-dumpslow
+lrwxrwxrwx	root/root	usr/bin/mysqlhotcopy -> mariadb-hotcopy
+lrwxrwxrwx	root/root	usr/bin/mysqlimport -> mariadb-import
+lrwxrwxrwx	root/root	usr/bin/mysqlshow -> mariadb-show
+lrwxrwxrwx	root/root	usr/bin/mysqlslap -> mariadb-slap
+lrwxrwxrwx	root/root	usr/bin/mysqltest -> mariadb-test
+lrwxrwxrwx	root/root	usr/bin/mysqltest_embedded -> mariadb-test-embedded
 -rwxr-xr-x	root/root	usr/bin/mytop
 -rwxr-xr-x	root/root	usr/bin/perror
 -rwxr-xr-x	root/root	usr/bin/replace
@@ -101,8 +105,6 @@ lrwxrwxrwx	root/root	usr/bin/mariadbd-safe-helper -> mysqld_safe_helper
 -rwxr-xr-x	root/root	usr/bin/resolveip
 -rwxr-xr-x	root/root	usr/bin/sst_dump
 -rwxr-xr-x	root/root	usr/bin/test-connect-t
--rwxr-xr-x	root/root	usr/bin/tokuft_logprint
--rwxr-xr-x	root/root	usr/bin/tokuftdump
 -rw-r--r--	root/root	usr/bin/wsrep_sst_common
 -rwxr-xr-x	root/root	usr/bin/wsrep_sst_mariabackup
 -rwxr-xr-x	root/root	usr/bin/wsrep_sst_mysqldump
@@ -172,17 +174,24 @@ drwxr-xr-x	root/root	usr/include/mysql/server/mysql/
 -rw-r--r--	root/root	usr/include/mysql/server/mysql/plugin_audit.h
 -rw-r--r--	root/root	usr/include/mysql/server/mysql/plugin_auth.h
 -rw-r--r--	root/root	usr/include/mysql/server/mysql/plugin_auth_common.h
+-rw-r--r--	root/root	usr/include/mysql/server/mysql/plugin_data_type.h
 -rw-r--r--	root/root	usr/include/mysql/server/mysql/plugin_encryption.h
 -rw-r--r--	root/root	usr/include/mysql/server/mysql/plugin_ftparser.h
+-rw-r--r--	root/root	usr/include/mysql/server/mysql/plugin_function.h
 -rw-r--r--	root/root	usr/include/mysql/server/mysql/plugin_password_validation.h
 drwxr-xr-x	root/root	usr/include/mysql/server/mysql/psi/
 -rw-r--r--	root/root	usr/include/mysql/server/mysql/psi/mysql_file.h
 -rw-r--r--	root/root	usr/include/mysql/server/mysql/psi/mysql_idle.h
+-rw-r--r--	root/root	usr/include/mysql/server/mysql/psi/mysql_mdl.h
+-rw-r--r--	root/root	usr/include/mysql/server/mysql/psi/mysql_memory.h
+-rw-r--r--	root/root	usr/include/mysql/server/mysql/psi/mysql_ps.h
 -rw-r--r--	root/root	usr/include/mysql/server/mysql/psi/mysql_socket.h
+-rw-r--r--	root/root	usr/include/mysql/server/mysql/psi/mysql_sp.h
 -rw-r--r--	root/root	usr/include/mysql/server/mysql/psi/mysql_stage.h
 -rw-r--r--	root/root	usr/include/mysql/server/mysql/psi/mysql_statement.h
 -rw-r--r--	root/root	usr/include/mysql/server/mysql/psi/mysql_table.h
 -rw-r--r--	root/root	usr/include/mysql/server/mysql/psi/mysql_thread.h
+-rw-r--r--	root/root	usr/include/mysql/server/mysql/psi/mysql_transaction.h
 -rw-r--r--	root/root	usr/include/mysql/server/mysql/psi/psi.h
 -rw-r--r--	root/root	usr/include/mysql/server/mysql/psi/psi_abi_v0.h
 -rw-r--r--	root/root	usr/include/mysql/server/mysql/psi/psi_abi_v1.h
@@ -206,6 +215,7 @@ drwxr-xr-x	root/root	usr/include/mysql/server/mysql/psi/
 -rw-r--r--	root/root	usr/include/mysql/server/mysql/service_thd_alloc.h
 -rw-r--r--	root/root	usr/include/mysql/server/mysql/service_thd_autoinc.h
 -rw-r--r--	root/root	usr/include/mysql/server/mysql/service_thd_error_context.h
+-rw-r--r--	root/root	usr/include/mysql/server/mysql/service_thd_mdl.h
 -rw-r--r--	root/root	usr/include/mysql/server/mysql/service_thd_rnd.h
 -rw-r--r--	root/root	usr/include/mysql/server/mysql/service_thd_specifics.h
 -rw-r--r--	root/root	usr/include/mysql/server/mysql/service_thd_timezone.h
@@ -222,6 +232,7 @@ drwxr-xr-x	root/root	usr/include/mysql/server/mysql/psi/
 -rw-r--r--	root/root	usr/include/mysql/server/pack.h
 drwxr-xr-x	root/root	usr/include/mysql/server/private/
 -rw-r--r--	root/root	usr/include/mysql/server/private/aria_backup.h
+-rw-r--r--	root/root	usr/include/mysql/server/private/assume_aligned.h
 drwxr-xr-x	root/root	usr/include/mysql/server/private/atomic/
 -rw-r--r--	root/root	usr/include/mysql/server/private/atomic/gcc_builtins.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/atomic/generic-msvc.h
@@ -256,6 +267,7 @@ drwxr-xr-x	root/root	usr/include/mysql/server/private/atomic/
 -rw-r--r--	root/root	usr/include/mysql/server/private/ft_global.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/gcalc_slicescan.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/gcalc_tools.h
+-rw-r--r--	root/root	usr/include/mysql/server/private/grant.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/group_by_handler.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/gstream.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/ha_partition.h
@@ -266,15 +278,14 @@ drwxr-xr-x	root/root	usr/include/mysql/server/private/atomic/
 -rw-r--r--	root/root	usr/include/mysql/server/private/hash_filo.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/heap.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/hostname.h
+-rw-r--r--	root/root	usr/include/mysql/server/private/ilist.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/init.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/innodb_priv.h
--rw-r--r--	root/root	usr/include/mysql/server/private/intrusive_list.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/item.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/item_cmpfunc.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/item_create.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/item_func.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/item_geofunc.h
--rw-r--r--	root/root	usr/include/mysql/server/private/item_inetfunc.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/item_jsonfunc.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/item_row.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/item_strfunc.h
@@ -304,6 +315,7 @@ drwxr-xr-x	root/root	usr/include/mysql/server/private/atomic/
 -rw-r--r--	root/root	usr/include/mysql/server/private/my_alarm.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/my_apc.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/my_atomic.h
+-rw-r--r--	root/root	usr/include/mysql/server/private/my_atomic_wrapper.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/my_base.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/my_bit.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/my_bitmap.h
@@ -323,6 +335,7 @@ drwxr-xr-x	root/root	usr/include/mysql/server/private/atomic/
 -rw-r--r--	root/root	usr/include/mysql/server/private/my_rdtsc.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/my_rnd.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/my_service_manager.h
+-rw-r--r--	root/root	usr/include/mysql/server/private/my_stack_alloc.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/my_stacktrace.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/my_time.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/my_tree.h
@@ -346,7 +359,17 @@ drwxr-xr-x	root/root	usr/include/mysql/server/private/atomic/
 -rw-r--r--	root/root	usr/include/mysql/server/private/partition_element.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/partition_info.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/password.h
--rw-r--r--	root/root	usr/include/mysql/server/private/pcre.h
+-rw-r--r--	root/root	usr/include/mysql/server/private/pfs_file_provider.h
+-rw-r--r--	root/root	usr/include/mysql/server/private/pfs_idle_provider.h
+-rw-r--r--	root/root	usr/include/mysql/server/private/pfs_memory_provider.h
+-rw-r--r--	root/root	usr/include/mysql/server/private/pfs_metadata_provider.h
+-rw-r--r--	root/root	usr/include/mysql/server/private/pfs_socket_provider.h
+-rw-r--r--	root/root	usr/include/mysql/server/private/pfs_stage_provider.h
+-rw-r--r--	root/root	usr/include/mysql/server/private/pfs_statement_provider.h
+-rw-r--r--	root/root	usr/include/mysql/server/private/pfs_table_provider.h
+-rw-r--r--	root/root	usr/include/mysql/server/private/pfs_thread_provider.h
+-rw-r--r--	root/root	usr/include/mysql/server/private/pfs_transaction_provider.h
+-rw-r--r--	root/root	usr/include/mysql/server/private/privilege.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/probes_mysql.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/probes_mysql_nodtrace.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/procedure.h
@@ -423,10 +446,12 @@ drwxr-xr-x	root/root	usr/include/mysql/server/private/atomic/
 -rw-r--r--	root/root	usr/include/mysql/server/private/sql_handler.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/sql_help.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/sql_hset.h
+-rw-r--r--	root/root	usr/include/mysql/server/private/sql_i_s.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/sql_insert.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/sql_join_cache.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/sql_lex.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/sql_lifo_buffer.h
+-rw-r--r--	root/root	usr/include/mysql/server/private/sql_limit.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/sql_list.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/sql_load.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/sql_locale.h
@@ -460,9 +485,11 @@ drwxr-xr-x	root/root	usr/include/mysql/server/private/atomic/
 -rw-r--r--	root/root	usr/include/mysql/server/private/sql_truncate.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/sql_tvc.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/sql_type.h
+-rw-r--r--	root/root	usr/include/mysql/server/private/sql_type_geom.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/sql_type_int.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/sql_type_json.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/sql_type_real.h
+-rw-r--r--	root/root	usr/include/mysql/server/private/sql_type_string.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/sql_udf.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/sql_union.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/sql_update.h
@@ -479,15 +506,16 @@ drwxr-xr-x	root/root	usr/include/mysql/server/private/atomic/
 -rw-r--r--	root/root	usr/include/mysql/server/private/thr_lock.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/thr_malloc.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/thr_timer.h
+-rw-r--r--	root/root	usr/include/mysql/server/private/thread_cache.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/thread_pool_priv.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/threadpool.h
+-rw-r--r--	root/root	usr/include/mysql/server/private/threadpool_generic.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/transaction.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/tzfile.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/tztime.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/uniques.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/unireg.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/vers_string.h
--rw-r--r--	root/root	usr/include/mysql/server/private/vers_utils.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/violite.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/waiting_threads.h
 -rw-r--r--	root/root	usr/include/mysql/server/private/welcome_copyright_notice.h
@@ -556,6 +584,7 @@ drwx------	root/root	usr/lib/mysql/plugin/auth_pam_tool_dir/
 -rwxr-xr-x	root/root	usr/lib/mysql/plugin/disks.so
 -rwxr-xr-x	root/root	usr/lib/mysql/plugin/example_key_management.so
 -rwxr-xr-x	root/root	usr/lib/mysql/plugin/file_key_management.so
+-rwxr-xr-x	root/root	usr/lib/mysql/plugin/func_test.so
 -rwxr-xr-x	root/root	usr/lib/mysql/plugin/ha_archive.so
 -rwxr-xr-x	root/root	usr/lib/mysql/plugin/ha_blackhole.so
 -rwxr-xr-x	root/root	usr/lib/mysql/plugin/ha_connect.so
@@ -564,10 +593,10 @@ drwx------	root/root	usr/lib/mysql/plugin/auth_pam_tool_dir/
 -rwxr-xr-x	root/root	usr/lib/mysql/plugin/ha_federatedx.so
 -rwxr-xr-x	root/root	usr/lib/mysql/plugin/ha_mroonga.so
 -rwxr-xr-x	root/root	usr/lib/mysql/plugin/ha_rocksdb.so
+-rwxr-xr-x	root/root	usr/lib/mysql/plugin/ha_s3.so
 -rwxr-xr-x	root/root	usr/lib/mysql/plugin/ha_sphinx.so
 -rwxr-xr-x	root/root	usr/lib/mysql/plugin/ha_spider.so
 -rwxr-xr-x	root/root	usr/lib/mysql/plugin/ha_test_sql_discovery.so
--rwxr-xr-x	root/root	usr/lib/mysql/plugin/ha_tokudb.so
 -rwxr-xr-x	root/root	usr/lib/mysql/plugin/handlersocket.so
 -rwxr-xr-x	root/root	usr/lib/mysql/plugin/libdaemon_example.so
 -rwxr-xr-x	root/root	usr/lib/mysql/plugin/locales.so
@@ -584,13 +613,14 @@ drwx------	root/root	usr/lib/mysql/plugin/auth_pam_tool_dir/
 -rwxr-xr-x	root/root	usr/lib/mysql/plugin/simple_password_check.so
 -rwxr-xr-x	root/root	usr/lib/mysql/plugin/sql_errlog.so
 -rwxr-xr-x	root/root	usr/lib/mysql/plugin/test_versioning.so
+-rwxr-xr-x	root/root	usr/lib/mysql/plugin/type_test.so
 -rwxr-xr-x	root/root	usr/lib/mysql/plugin/wsrep_info.so
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libmariadb.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/mariadb.pc
 drwxr-xr-x	root/root	usr/sbin/
-lrwxrwxrwx	root/root	usr/sbin/mariadbd -> mysqld
--rwxr-xr-x	root/root	usr/sbin/mysqld
+-rwxr-xr-x	root/root	usr/sbin/mariadbd
+lrwxrwxrwx	root/root	usr/sbin/mysqld -> mariadbd
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/aclocal/
 -rw-r--r--	root/root	usr/share/aclocal/mysql.m4
@@ -612,6 +642,7 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/mariadb-check.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mariadb-client-test-embedded.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mariadb-client-test.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/mariadb-conv.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mariadb-convert-table-format.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mariadb-dump.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mariadb-dumpslow.1.gz
@@ -634,6 +665,7 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/mariadb-upgrade.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mariadb-waitpid.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mariadb.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/mariadb_config.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mariadbd-multi.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mariadbd-safe-helper.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mariadbd-safe.1.gz
@@ -645,6 +677,7 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/myisamchk.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/myisamlog.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/myisampack.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/myrocks_hotbackup.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysql-stress-test.pl.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysql.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysql.server.1.gz
@@ -678,12 +711,11 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/mysqlslap.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysqltest.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysqltest_embedded.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/mytop.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/perror.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/replace.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/resolve_stack_dump.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/resolveip.1.gz
--rw-r--r--	root/root	usr/share/man/man1/tokuft_logprint.1.gz
--rw-r--r--	root/root	usr/share/man/man1/tokuftdump.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/wsrep_sst_common.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/wsrep_sst_mariabackup.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/wsrep_sst_mysqldump.1.gz
@@ -725,7 +757,6 @@ drwxr-xr-x	root/root	usr/share/mysql/english/
 -rw-r--r--	root/root	usr/share/mysql/english/errmsg.sys
 -rw-r--r--	root/root	usr/share/mysql/errmsg-utf8.txt
 -rw-r--r--	root/root	usr/share/mysql/fill_help_tables.sql
--rw-r--r--	root/root	usr/share/mysql/install_spider.sql
 -rw-r--r--	root/root	usr/share/mysql/magic
 -rw-r--r--	root/root	usr/share/mysql/maria_add_gis_sp.sql
 -rw-r--r--	root/root	usr/share/mysql/maria_add_gis_sp_bootstrap.sql
diff --git a/mariadb/.signature b/mariadb/.signature
index fa0ddff43..782920a5d 100644
--- a/mariadb/.signature
+++ b/mariadb/.signature
@@ -1,8 +1,8 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/VRRZt1KEmlNVXF/lZo1YQytiL3oJsO5lb1+znlneoWJ473rKlaCQ7ZZv9rTqVK77SwIlZ1xTviPo3UDtwokWwE=
-SHA256 (Pkgfile) = e94b150b96b275e8985d0541da9bf2f130c2a0ffc66a4b1dd0ac604b2f16aaa5
-SHA256 (.footprint) = 6040b6f2094b4e29fc356610550a35d610d34c183a4df0c209d8413fa023efc5
-SHA256 (mariadb-10.4.13.tar.gz) = 45bbbb12d1de8febd9edf630e940c23cf14efd60570c743b268069516a5d91df
+RWSE3ohX2g5d/a4w9g7JPWcWFlRoTebFwqmKvHVbYWGEZHH/GCIOrxXWx17pyTiUIA3BTZX/X2kVDPLmD7QfASMfuRo1dhXDTA8=
+SHA256 (Pkgfile) = b477436097e72a4c5394e2b850af9f87802c9844c8b6449ebbe7cb618aaaee99
+SHA256 (.footprint) = e4cc5cc9a6797e0efd1a647cd967fc51579859f99457c7407a5ecdbacc951fb4
+SHA256 (mariadb-10.5.4.tar.gz) = 26db2becc9cec37e99a4e73390bd2eaa74568e21f9cf110359f4f68b37154c72
 SHA256 (mariadb.rc) = 737fe0eaad407e2b078ba21c1e4082dc4361da10354939ed4f6da651a76a8c1f
 SHA256 (mariadb.pam) = 962b53d37719ed4798643a8fe3557454d23f74c2b14f1dfc1c1c67d361cab891
 SHA256 (pre-install) = 62040c17eeb3da88172d49240633c871a93c3c642ad7f61911ce2e83d8414d1c
diff --git a/mariadb/Pkgfile b/mariadb/Pkgfile
index 842a5d683..9bc2b8c1d 100644
--- a/mariadb/Pkgfile
+++ b/mariadb/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  ncurses zlib openssl cmake libaio linux-pam
 
 name=mariadb
-version=10.4.13
+version=10.5.4
 release=1
 source=(https://downloads.mariadb.com/MariaDB//$name-$version/source/$name-$version.tar.gz 
         mariadb.rc mariadb.pam