diff --git a/databases/mariadb114-client/pkg-plist b/databases/mariadb114-client/pkg-plist index 7c863425749f..2efc25cdc504 100644 --- a/databases/mariadb114-client/pkg-plist +++ b/databases/mariadb114-client/pkg-plist @@ -1,263 +1,263 @@ bin/mariadb bin/mariadb-access bin/mariadb-admin bin/mariadb-binlog bin/mariadb-check bin/mariadb-config bin/mariadb-conv bin/mariadb-convert-table-format bin/mariadb-dump bin/mariadb-dumpslow bin/mariadb-find-rows bin/mariadb-hotcopy bin/mariadb-import bin/mariadb-plugin bin/mariadb-secure-installation bin/mariadb-setpermission bin/mariadb-show bin/mariadb-slap bin/mariadb-test bin/mariadb-waitpid bin/mariadb_config bin/msql2mysql bin/my_print_defaults bin/mysql bin/mysql_config bin/mysql_convert_table_format bin/mysql_find_rows bin/mysql_plugin bin/mysql_secure_installation bin/mysql_setpermission bin/mysql_waitpid bin/mysqlaccess bin/mysqladmin bin/mysqlbinlog bin/mysqlcheck bin/mysqldump bin/mysqldumpslow bin/mysqlhotcopy bin/mysqlimport bin/mysqlshow bin/mysqlslap bin/mysqltest bin/mytop bin/replace bin/resolve_stack_dump -%%ETCDIR%%/conf.d/client.cnf.sample -%%ETCDIR%%/my.cnf.sample +@sample %%ETCDIR%%/conf.d/client.cnf.sample +@sample %%ETCDIR%%/my.cnf.sample include/mysql/errmsg.h include/mysql/ma_list.h include/mysql/ma_pvio.h include/mysql/ma_tls.h include/mysql/mariadb/ma_io.h include/mysql/mariadb_com.h include/mysql/mariadb_ctype.h include/mysql/mariadb_dyncol.h include/mysql/mariadb_rpl.h include/mysql/mariadb_stmt.h include/mysql/mariadb_version.h include/mysql/my_alloca.h include/mysql/my_config.h include/mysql/my_global.h include/mysql/my_sys.h include/mysql/mysql.h include/mysql/mysql/client_plugin.h include/mysql/mysql/plugin_auth.h include/mysql/mysql_com.h include/mysql/mysql_version.h include/mysql/mysqld_error.h %%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so lib/mysql/libmariadb.a lib/mysql/libmariadb.so lib/mysql/libmariadb.so.3 lib/mysql/libmariadbclient.a lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so lib/mysql/libmysqlservices.a lib/mysql/plugin/caching_sha2_password.so lib/mysql/plugin/client_ed25519.so lib/mysql/plugin/daemon_example.ini lib/mysql/plugin/dialog.so lib/mysql/plugin/mysql_clear_password.so lib/mysql/plugin/sha256_password.so lib/mysql/plugin/zstd.so libdata/pkgconfig/libmariadb.pc share/man/man1/mariadb-access.1.gz share/man/man1/mariadb-admin.1.gz share/man/man1/mariadb-binlog.1.gz share/man/man1/mariadb-check.1.gz share/man/man1/mariadb-client-test-embedded.1.gz share/man/man1/mariadb-client-test.1.gz share/man/man1/mariadb-convert-table-format.1.gz share/man/man1/mariadb-dump.1.gz share/man/man1/mariadb-dumpslow.1.gz @comment share/man/man1/mariadb-embedded.1.gz share/man/man1/mariadb-find-rows.1.gz share/man/man1/mariadb-hotcopy.1.gz share/man/man1/mariadb-import.1.gz share/man/man1/mariadb-plugin.1.gz share/man/man1/mariadb-secure-installation.1.gz share/man/man1/mariadb-setpermission.1.gz share/man/man1/mariadb-show.1.gz share/man/man1/mariadb-slap.1.gz share/man/man1/mariadb-test-embedded.1.gz share/man/man1/mariadb-test.1.gz share/man/man1/mariadb-tzinfo-to-sql.1.gz share/man/man1/mariadb-waitpid.1.gz share/man/man1/mariadb.1.gz share/man/man1/mariadb_config.1.gz share/man/man1/msql2mysql.1.gz share/man/man1/my_print_defaults.1.gz share/man/man1/my_safe_process.1.gz share/man/man1/mysql-stress-test.pl.1.gz share/man/man1/mysql-test-run.pl.1.gz share/man/man1/mysql.1.gz share/man/man1/mysql_client_test.1.gz share/man/man1/mysql_client_test_embedded.1.gz share/man/man1/mysql_config.1.gz share/man/man1/mysql_convert_table_format.1.gz share/man/man1/mysql_embedded.1.gz share/man/man1/mysql_find_rows.1.gz share/man/man1/mysql_plugin.1.gz share/man/man1/mysql_secure_installation.1.gz share/man/man1/mysql_setpermission.1.gz @comment share/man/man1/mysql_tzinfo_to_sql.1.gz share/man/man1/mysql_waitpid.1.gz share/man/man1/mysqlaccess.1.gz share/man/man1/mysqladmin.1.gz share/man/man1/mysqlbinlog.1.gz share/man/man1/mysqlcheck.1.gz share/man/man1/mysqldump.1.gz share/man/man1/mysqldumpslow.1.gz share/man/man1/mysqlhotcopy.1.gz share/man/man1/mysqlimport.1.gz share/man/man1/mysqlshow.1.gz share/man/man1/mysqlslap.1.gz share/man/man1/mysqltest.1.gz share/man/man1/mysqltest_embedded.1.gz @comment share/man/man1/mytop.1.gz share/man/man1/perror.1.gz share/man/man1/replace.1.gz share/man/man1/resolve_stack_dump.1.gz share/man/man3/mariadb_cancel.3.gz share/man/man3/mariadb_connection.3.gz share/man/man3/mariadb_dyncol_check.3.gz share/man/man3/mariadb_dyncol_column_cmp_named.3.gz share/man/man3/mariadb_dyncol_column_count.3.gz share/man/man3/mariadb_dyncol_create_many_named.3.gz share/man/man3/mariadb_dyncol_create_many_num.3.gz share/man/man3/mariadb_dyncol_exists_named.3.gz share/man/man3/mariadb_dyncol_exists_num.3.gz share/man/man3/mariadb_dyncol_free.3.gz share/man/man3/mariadb_dyncol_list_named.3.gz share/man/man3/mariadb_dyncol_list_num.3.gz share/man/man3/mariadb_dyncol_unpack.3.gz share/man/man3/mariadb_dyncol_update_many_named.3.gz share/man/man3/mariadb_dyncol_update_many_num.3.gz share/man/man3/mariadb_get_infov.3.gz share/man/man3/mariadb_reconnect.3.gz share/man/man3/mariadb_rpl_close.3.gz share/man/man3/mariadb_rpl_fetch.3.gz share/man/man3/mariadb_rpl_get_optionsv.3.gz share/man/man3/mariadb_rpl_open.3.gz share/man/man3/mariadb_rpl_optionsv.3.gz share/man/man3/mariadb_stmt_execute_direct.3.gz share/man/man3/mariadb_stmt_fetch_fields.3.gz share/man/man3/mysql_affected_rows.3.gz share/man/man3/mysql_autocommit.3.gz share/man/man3/mysql_change_user.3.gz share/man/man3/mysql_close.3.gz share/man/man3/mysql_commit.3.gz share/man/man3/mysql_data_seek.3.gz share/man/man3/mysql_errno.3.gz share/man/man3/mysql_error.3.gz share/man/man3/mysql_fetch_field.3.gz share/man/man3/mysql_fetch_field_direct.3.gz share/man/man3/mysql_fetch_fields.3.gz share/man/man3/mysql_fetch_lengths.3.gz share/man/man3/mysql_fetch_row.3.gz share/man/man3/mysql_field_count.3.gz share/man/man3/mysql_field_seek.3.gz share/man/man3/mysql_field_tell.3.gz share/man/man3/mysql_free_result.3.gz share/man/man3/mysql_get_character_set_info.3.gz share/man/man3/mysql_get_client_info.3.gz share/man/man3/mysql_get_client_version.3.gz share/man/man3/mysql_get_host_info.3.gz share/man/man3/mysql_get_proto_info.3.gz share/man/man3/mysql_get_server_info.3.gz share/man/man3/mysql_get_server_version.3.gz share/man/man3/mysql_get_socket.3.gz share/man/man3/mysql_get_ssl_cipher.3.gz share/man/man3/mysql_hex_string.3.gz share/man/man3/mysql_info.3.gz share/man/man3/mysql_init.3.gz share/man/man3/mysql_kill.3.gz share/man/man3/mysql_more_results.3.gz share/man/man3/mysql_next_result.3.gz share/man/man3/mysql_num_fields.3.gz share/man/man3/mysql_num_rows.3.gz share/man/man3/mysql_options.3.gz share/man/man3/mysql_options4.3.gz share/man/man3/mysql_optionsv.3.gz share/man/man3/mysql_ping.3.gz share/man/man3/mysql_query.3.gz share/man/man3/mysql_read_query_result.3.gz share/man/man3/mysql_real_connect.3.gz share/man/man3/mysql_real_escape_string.3.gz share/man/man3/mysql_real_query.3.gz share/man/man3/mysql_refresh.3.gz share/man/man3/mysql_reset_connection.3.gz share/man/man3/mysql_rollback.3.gz share/man/man3/mysql_row_seek.3.gz share/man/man3/mysql_row_tell.3.gz share/man/man3/mysql_select_db.3.gz share/man/man3/mysql_send_query.3.gz share/man/man3/mysql_server_end.3.gz share/man/man3/mysql_server_init.3.gz share/man/man3/mysql_session_track_get_first.3.gz share/man/man3/mysql_session_track_get_next.3.gz share/man/man3/mysql_set_character_set.3.gz share/man/man3/mysql_set_server_option.3.gz share/man/man3/mysql_shutdown.3.gz share/man/man3/mysql_sqlstate.3.gz share/man/man3/mysql_ssl_set.3.gz share/man/man3/mysql_stat.3.gz share/man/man3/mysql_stmt_affected_rows.3.gz share/man/man3/mysql_stmt_attr_get.3.gz share/man/man3/mysql_stmt_attr_set.3.gz share/man/man3/mysql_stmt_bind_param.3.gz share/man/man3/mysql_stmt_bind_result.3.gz share/man/man3/mysql_stmt_close.3.gz share/man/man3/mysql_stmt_data_seek.3.gz share/man/man3/mysql_stmt_errno.3.gz share/man/man3/mysql_stmt_error.3.gz share/man/man3/mysql_stmt_execute.3.gz share/man/man3/mysql_stmt_fetch.3.gz share/man/man3/mysql_stmt_fetch_column.3.gz share/man/man3/mysql_stmt_field_count.3.gz share/man/man3/mysql_stmt_free_result.3.gz share/man/man3/mysql_stmt_init.3.gz share/man/man3/mysql_stmt_insert_id.3.gz share/man/man3/mysql_stmt_more_results.3.gz share/man/man3/mysql_stmt_next_result.3.gz share/man/man3/mysql_stmt_num_rows.3.gz share/man/man3/mysql_stmt_param_count.3.gz share/man/man3/mysql_stmt_param_metadata.3.gz share/man/man3/mysql_stmt_prepare.3.gz share/man/man3/mysql_stmt_reset.3.gz share/man/man3/mysql_stmt_result_metadata.3.gz share/man/man3/mysql_stmt_row_seek.3.gz share/man/man3/mysql_stmt_row_tell.3.gz share/man/man3/mysql_stmt_send_long_data.3.gz share/man/man3/mysql_stmt_sqlstate.3.gz share/man/man3/mysql_stmt_store_result.3.gz share/man/man3/mysql_stmt_warning_count.3.gz share/man/man3/mysql_store_result.3.gz share/man/man3/mysql_thread_end.3.gz share/man/man3/mysql_thread_id.3.gz share/man/man3/mysql_thread_init.3.gz share/man/man3/mysql_use_result.3.gz share/man/man3/mysql_warning_count.3.gz diff --git a/databases/mariadb114-connector-c/Makefile b/databases/mariadb114-connector-c/Makefile new file mode 100644 index 000000000000..15501b91c787 --- /dev/null +++ b/databases/mariadb114-connector-c/Makefile @@ -0,0 +1,12 @@ +PORTNAME= mariadb +PKGNAMESUFFIX= 114-connector-c + +COMMENT= Multithreaded SQL database (client) + +MASTERDIR= ${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX:C/-connector-c/-server/} + +LICENSE_FILE?= ${WRKSRC}/COPYING.LIB + +PLIST= ${.CURDIR}/pkg-plist + +.include "${MASTERDIR}/Makefile" diff --git a/databases/mariadb114-connector-c/distinfo b/databases/mariadb114-connector-c/distinfo new file mode 100644 index 000000000000..d501ccd5997a --- /dev/null +++ b/databases/mariadb114-connector-c/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1703845639 +SHA256 (mariadb-connector-c-3.3.8-src.tar.gz) = f9f076b4aa9fb22cc94b24f82c80f9ef063805ecd6533a2eb5d5060cf93833e8 +SIZE (mariadb-connector-c-3.3.8-src.tar.gz) = 1393368 diff --git a/databases/mariadb114-connector-c/pkg-descr b/databases/mariadb114-connector-c/pkg-descr new file mode 100644 index 000000000000..258f2007a9b0 --- /dev/null +++ b/databases/mariadb114-connector-c/pkg-descr @@ -0,0 +1,6 @@ +The MariaDB Connector/C is used to connect applications developed in C/C++ +to MariaDB and MySQL databases. MySQL Connector/C is LGPL licensed. + +Parts of MariaDB Connector/C are derived from PHP\'s mysqlnd extension and +the original LGPL MySQL client library for MySQL 3.23. The rest of the code +is written by developers at MariaDB Corporation Ab. diff --git a/databases/mariadb114-client/pkg-plist b/databases/mariadb114-connector-c/pkg-plist similarity index 54% copy from databases/mariadb114-client/pkg-plist copy to databases/mariadb114-connector-c/pkg-plist index 7c863425749f..5ebcc5330524 100644 --- a/databases/mariadb114-client/pkg-plist +++ b/databases/mariadb114-connector-c/pkg-plist @@ -1,263 +1,150 @@ -bin/mariadb -bin/mariadb-access -bin/mariadb-admin -bin/mariadb-binlog -bin/mariadb-check -bin/mariadb-config -bin/mariadb-conv -bin/mariadb-convert-table-format -bin/mariadb-dump -bin/mariadb-dumpslow -bin/mariadb-find-rows -bin/mariadb-hotcopy -bin/mariadb-import -bin/mariadb-plugin -bin/mariadb-secure-installation -bin/mariadb-setpermission -bin/mariadb-show -bin/mariadb-slap -bin/mariadb-test -bin/mariadb-waitpid bin/mariadb_config -bin/msql2mysql -bin/my_print_defaults -bin/mysql -bin/mysql_config -bin/mysql_convert_table_format -bin/mysql_find_rows -bin/mysql_plugin -bin/mysql_secure_installation -bin/mysql_setpermission -bin/mysql_waitpid -bin/mysqlaccess -bin/mysqladmin -bin/mysqlbinlog -bin/mysqlcheck -bin/mysqldump -bin/mysqldumpslow -bin/mysqlhotcopy -bin/mysqlimport -bin/mysqlshow -bin/mysqlslap -bin/mysqltest -bin/mytop -bin/replace -bin/resolve_stack_dump -%%ETCDIR%%/conf.d/client.cnf.sample -%%ETCDIR%%/my.cnf.sample -include/mysql/errmsg.h -include/mysql/ma_list.h -include/mysql/ma_pvio.h -include/mysql/ma_tls.h -include/mysql/mariadb/ma_io.h -include/mysql/mariadb_com.h -include/mysql/mariadb_ctype.h -include/mysql/mariadb_dyncol.h -include/mysql/mariadb_rpl.h -include/mysql/mariadb_stmt.h -include/mysql/mariadb_version.h -include/mysql/my_alloca.h -include/mysql/my_config.h -include/mysql/my_global.h -include/mysql/my_sys.h -include/mysql/mysql.h -include/mysql/mysql/client_plugin.h -include/mysql/mysql/plugin_auth.h -include/mysql/mysql_com.h -include/mysql/mysql_version.h -include/mysql/mysqld_error.h -%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so -lib/mysql/libmariadb.a -lib/mysql/libmariadb.so -lib/mysql/libmariadb.so.3 -lib/mysql/libmariadbclient.a -lib/mysql/libmysqlclient.a -lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient_r.a -lib/mysql/libmysqlclient_r.so -lib/mysql/libmysqlservices.a -lib/mysql/plugin/caching_sha2_password.so -lib/mysql/plugin/client_ed25519.so -lib/mysql/plugin/daemon_example.ini -lib/mysql/plugin/dialog.so -lib/mysql/plugin/mysql_clear_password.so -lib/mysql/plugin/sha256_password.so -lib/mysql/plugin/zstd.so +include/mariadb/errmsg.h +include/mariadb/ma_list.h +include/mariadb/ma_pvio.h +include/mariadb/ma_tls.h +include/mariadb/mariadb/ma_io.h +include/mariadb/mariadb_com.h +include/mariadb/mariadb_ctype.h +include/mariadb/mariadb_dyncol.h +include/mariadb/mariadb_rpl.h +include/mariadb/mariadb_stmt.h +include/mariadb/mariadb_version.h +include/mariadb/mysql.h +include/mariadb/mysql/client_plugin.h +include/mariadb/mysql/plugin_auth.h +include/mariadb/mysql/plugin_auth_common.h +include/mariadb/mysqld_error.h +lib/mariadb/libmariadb.a +lib/mariadb/libmariadb.so +lib/mariadb/libmariadb.so.3 +lib/mariadb/libmariadbclient.a +lib/mariadb/plugin/auth_gssapi_client.so +lib/mariadb/plugin/caching_sha2_password.so +lib/mariadb/plugin/client_ed25519.so +lib/mariadb/plugin/dialog.so +lib/mariadb/plugin/mysql_clear_password.so +lib/mariadb/plugin/remote_io.so +lib/mariadb/plugin/sha256_password.so +lib/mariadb/plugin/zstd.so libdata/pkgconfig/libmariadb.pc -share/man/man1/mariadb-access.1.gz -share/man/man1/mariadb-admin.1.gz -share/man/man1/mariadb-binlog.1.gz -share/man/man1/mariadb-check.1.gz -share/man/man1/mariadb-client-test-embedded.1.gz -share/man/man1/mariadb-client-test.1.gz -share/man/man1/mariadb-convert-table-format.1.gz -share/man/man1/mariadb-dump.1.gz -share/man/man1/mariadb-dumpslow.1.gz -@comment share/man/man1/mariadb-embedded.1.gz -share/man/man1/mariadb-find-rows.1.gz -share/man/man1/mariadb-hotcopy.1.gz -share/man/man1/mariadb-import.1.gz -share/man/man1/mariadb-plugin.1.gz -share/man/man1/mariadb-secure-installation.1.gz -share/man/man1/mariadb-setpermission.1.gz -share/man/man1/mariadb-show.1.gz -share/man/man1/mariadb-slap.1.gz -share/man/man1/mariadb-test-embedded.1.gz -share/man/man1/mariadb-test.1.gz -share/man/man1/mariadb-tzinfo-to-sql.1.gz -share/man/man1/mariadb-waitpid.1.gz -share/man/man1/mariadb.1.gz -share/man/man1/mariadb_config.1.gz -share/man/man1/msql2mysql.1.gz -share/man/man1/my_print_defaults.1.gz -share/man/man1/my_safe_process.1.gz -share/man/man1/mysql-stress-test.pl.1.gz -share/man/man1/mysql-test-run.pl.1.gz -share/man/man1/mysql.1.gz -share/man/man1/mysql_client_test.1.gz -share/man/man1/mysql_client_test_embedded.1.gz -share/man/man1/mysql_config.1.gz -share/man/man1/mysql_convert_table_format.1.gz -share/man/man1/mysql_embedded.1.gz -share/man/man1/mysql_find_rows.1.gz -share/man/man1/mysql_plugin.1.gz -share/man/man1/mysql_secure_installation.1.gz -share/man/man1/mysql_setpermission.1.gz -@comment share/man/man1/mysql_tzinfo_to_sql.1.gz -share/man/man1/mysql_waitpid.1.gz -share/man/man1/mysqlaccess.1.gz -share/man/man1/mysqladmin.1.gz -share/man/man1/mysqlbinlog.1.gz -share/man/man1/mysqlcheck.1.gz -share/man/man1/mysqldump.1.gz -share/man/man1/mysqldumpslow.1.gz -share/man/man1/mysqlhotcopy.1.gz -share/man/man1/mysqlimport.1.gz -share/man/man1/mysqlshow.1.gz -share/man/man1/mysqlslap.1.gz -share/man/man1/mysqltest.1.gz -share/man/man1/mysqltest_embedded.1.gz -@comment share/man/man1/mytop.1.gz -share/man/man1/perror.1.gz -share/man/man1/replace.1.gz -share/man/man1/resolve_stack_dump.1.gz share/man/man3/mariadb_cancel.3.gz share/man/man3/mariadb_connection.3.gz share/man/man3/mariadb_dyncol_check.3.gz share/man/man3/mariadb_dyncol_column_cmp_named.3.gz share/man/man3/mariadb_dyncol_column_count.3.gz share/man/man3/mariadb_dyncol_create_many_named.3.gz share/man/man3/mariadb_dyncol_create_many_num.3.gz share/man/man3/mariadb_dyncol_exists_named.3.gz share/man/man3/mariadb_dyncol_exists_num.3.gz share/man/man3/mariadb_dyncol_free.3.gz share/man/man3/mariadb_dyncol_list_named.3.gz share/man/man3/mariadb_dyncol_list_num.3.gz share/man/man3/mariadb_dyncol_unpack.3.gz share/man/man3/mariadb_dyncol_update_many_named.3.gz share/man/man3/mariadb_dyncol_update_many_num.3.gz share/man/man3/mariadb_get_infov.3.gz share/man/man3/mariadb_reconnect.3.gz share/man/man3/mariadb_rpl_close.3.gz share/man/man3/mariadb_rpl_fetch.3.gz share/man/man3/mariadb_rpl_get_optionsv.3.gz share/man/man3/mariadb_rpl_open.3.gz share/man/man3/mariadb_rpl_optionsv.3.gz share/man/man3/mariadb_stmt_execute_direct.3.gz share/man/man3/mariadb_stmt_fetch_fields.3.gz share/man/man3/mysql_affected_rows.3.gz share/man/man3/mysql_autocommit.3.gz share/man/man3/mysql_change_user.3.gz share/man/man3/mysql_close.3.gz share/man/man3/mysql_commit.3.gz share/man/man3/mysql_data_seek.3.gz share/man/man3/mysql_errno.3.gz share/man/man3/mysql_error.3.gz share/man/man3/mysql_fetch_field.3.gz share/man/man3/mysql_fetch_field_direct.3.gz share/man/man3/mysql_fetch_fields.3.gz share/man/man3/mysql_fetch_lengths.3.gz share/man/man3/mysql_fetch_row.3.gz share/man/man3/mysql_field_count.3.gz share/man/man3/mysql_field_seek.3.gz share/man/man3/mysql_field_tell.3.gz share/man/man3/mysql_free_result.3.gz share/man/man3/mysql_get_character_set_info.3.gz share/man/man3/mysql_get_client_info.3.gz share/man/man3/mysql_get_client_version.3.gz share/man/man3/mysql_get_host_info.3.gz share/man/man3/mysql_get_proto_info.3.gz share/man/man3/mysql_get_server_info.3.gz share/man/man3/mysql_get_server_version.3.gz share/man/man3/mysql_get_socket.3.gz share/man/man3/mysql_get_ssl_cipher.3.gz share/man/man3/mysql_hex_string.3.gz share/man/man3/mysql_info.3.gz share/man/man3/mysql_init.3.gz share/man/man3/mysql_kill.3.gz share/man/man3/mysql_more_results.3.gz share/man/man3/mysql_next_result.3.gz share/man/man3/mysql_num_fields.3.gz share/man/man3/mysql_num_rows.3.gz share/man/man3/mysql_options.3.gz share/man/man3/mysql_options4.3.gz share/man/man3/mysql_optionsv.3.gz share/man/man3/mysql_ping.3.gz share/man/man3/mysql_query.3.gz share/man/man3/mysql_read_query_result.3.gz share/man/man3/mysql_real_connect.3.gz share/man/man3/mysql_real_escape_string.3.gz share/man/man3/mysql_real_query.3.gz share/man/man3/mysql_refresh.3.gz share/man/man3/mysql_reset_connection.3.gz share/man/man3/mysql_rollback.3.gz share/man/man3/mysql_row_seek.3.gz share/man/man3/mysql_row_tell.3.gz share/man/man3/mysql_select_db.3.gz share/man/man3/mysql_send_query.3.gz share/man/man3/mysql_server_end.3.gz share/man/man3/mysql_server_init.3.gz share/man/man3/mysql_session_track_get_first.3.gz share/man/man3/mysql_session_track_get_next.3.gz share/man/man3/mysql_set_character_set.3.gz share/man/man3/mysql_set_server_option.3.gz share/man/man3/mysql_shutdown.3.gz share/man/man3/mysql_sqlstate.3.gz share/man/man3/mysql_ssl_set.3.gz share/man/man3/mysql_stat.3.gz share/man/man3/mysql_stmt_affected_rows.3.gz share/man/man3/mysql_stmt_attr_get.3.gz share/man/man3/mysql_stmt_attr_set.3.gz share/man/man3/mysql_stmt_bind_param.3.gz share/man/man3/mysql_stmt_bind_result.3.gz share/man/man3/mysql_stmt_close.3.gz share/man/man3/mysql_stmt_data_seek.3.gz share/man/man3/mysql_stmt_errno.3.gz share/man/man3/mysql_stmt_error.3.gz share/man/man3/mysql_stmt_execute.3.gz share/man/man3/mysql_stmt_fetch.3.gz share/man/man3/mysql_stmt_fetch_column.3.gz share/man/man3/mysql_stmt_field_count.3.gz share/man/man3/mysql_stmt_free_result.3.gz share/man/man3/mysql_stmt_init.3.gz share/man/man3/mysql_stmt_insert_id.3.gz share/man/man3/mysql_stmt_more_results.3.gz share/man/man3/mysql_stmt_next_result.3.gz share/man/man3/mysql_stmt_num_rows.3.gz share/man/man3/mysql_stmt_param_count.3.gz share/man/man3/mysql_stmt_param_metadata.3.gz share/man/man3/mysql_stmt_prepare.3.gz share/man/man3/mysql_stmt_reset.3.gz share/man/man3/mysql_stmt_result_metadata.3.gz share/man/man3/mysql_stmt_row_seek.3.gz share/man/man3/mysql_stmt_row_tell.3.gz share/man/man3/mysql_stmt_send_long_data.3.gz share/man/man3/mysql_stmt_sqlstate.3.gz share/man/man3/mysql_stmt_store_result.3.gz share/man/man3/mysql_stmt_warning_count.3.gz share/man/man3/mysql_store_result.3.gz share/man/man3/mysql_thread_end.3.gz share/man/man3/mysql_thread_id.3.gz share/man/man3/mysql_thread_init.3.gz share/man/man3/mysql_use_result.3.gz share/man/man3/mysql_warning_count.3.gz diff --git a/databases/mariadb114-server/Makefile b/databases/mariadb114-server/Makefile index aedd8e523081..abdb55961c63 100644 --- a/databases/mariadb114-server/Makefile +++ b/databases/mariadb114-server/Makefile @@ -1,291 +1,302 @@ PORTNAME?= mariadb -PORTVERSION= 11.4.2 +PORTVERSION= 11.4.3 CATEGORIES= databases MASTER_SITES= https://mirror.nodesdirect.com/${SITESDIR}/ \ https://mirror.one.com/${SITESDIR}/ \ https://ftp.nluug.nl/db/${SITESDIR}/ \ https://ftp.icm.edu.pl/pub/unix/database/${SITESDIR}/ \ https://mirror.truenetwork.ru/${SITESDIR}/ \ https://mirrors.aliyun.com/${SITESDIR}/ \ https://ftp.ubuntu-tw.org/mirror/${SITESDIR}/ \ https://mirror.kku.ac.th/${SITESDIR}/ \ https://espejito.fder.edu.uy/${SITESDIR}/ \ https://ftp.osuosl.org/pub/${SITESDIR}/ \ https://downloads.mariadb.org/rest-api/mariadb/${PORTVERSION}/ PKGNAMESUFFIX?= 114-server MAINTAINER= brnrd@FreeBSD.org COMMENT?= Multithreaded SQL database (server) WWW= https://mariadb.org/ LICENSE= GPLv2 LICENSE_FILE?= ${WRKSRC}/COPYING #EXPIRATION_DATE= 2029-05-30 LIB_DEPENDS+= libfmt.so:devel/libfmt \ liblz4.so:archivers/liblz4 \ libpcre2-8.so:devel/pcre2 \ libzstd.so:archivers/zstd # Ugly workaround for MariaDB/CMake library detection LDFLAGS+= -L${LOCALBASE}/lib USES= bison:build cmake:insource compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message USE_LDCONFIG= ${PREFIX}/lib/mysql SHEBANG_FILES?= scripts/*.sh support-files/*.sh SITESDIR= mariadb/mariadb-${PORTVERSION}/source DOCSDIR= ${PREFIX}/share/doc/mysql MARIADB_USER?= mysql MARIADB_GROUP?= mysql MARIADB_DBDIR?= /var/db/mysql MARIADB_RUNDIR?= /var/run/mysql MARIADB_SOCK?= mysql.sock MARIADB_LOGDIR?= /var/log/mysql USERS= ${MARIADB_USER} GROUPS= ${MARIADB_GROUP} OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_DEFAULT= GSSAPI_BASE .if ${PKGNAMESUFFIX:M*-server} # MySQL-Server options OPTIONS_DEFAULT+= AWS_KEY_MGMT CONNECT_EXTRA HASHICORP_VAULT INNOBASE SPHINX SPIDER WSREP OPTIONS_GROUP= COMPRESSION ENGINES GROONGA OPTIONS_DEFINE= AWS_KEY_MGMT CONNECT_EXTRA DOCS HASHICORP_VAULT OPTIONS_DEFINE_amd64= WSREP OPTIONS_DEFINE_aarch64= WSREP OPTIONS_DEFINE_powerpc64le= WSREP OPTIONS_DEFINE_powerpc64= WSREP OPTIONS_DEFINE_riscv64= WSREP OPTIONS_GROUP_COMPRESSION= LZO SNAPPY OPTIONS_GROUP_ENGINES= COLUMNSTORE INNOBASE MROONGA OQGRAPH ROCKSDB S3 SPHINX SPIDER OPTIONS_GROUP_GROONGA= ZMQ MSGPACK OPTIONS_EXCLUDE_i386= ROCKSDB +OPTIONS_SUB= yes AWS_KEY_MGMT_DESC= AWS Encryption Key Management Plugin COLUMNSTORE_DESC= Columnar storage egine CONNECT_EXTRA_DESC= Enable ODBC and XML in CONNECT engine COMPRESSION_DESC= Optional page compression ENGINES_DESC= Optional MariaDB storage engines GROONGA_DESC= Optional Mroonga features HASHICORP_VAULT_DESC= Enable HashiCorp vault key-storage plugin INNOBASE_DESC= InnoDB default engine MROONGA_DESC= Mroonga Full Text Search engine MSGPACK_DESC= MsgPack support OQGRAPH_DESC= Open Query Graph Computation engine ROCKSDB_DESC= RocksDB LSM engine S3_DESC= S3 storage engine (Gamma) SPHINX_DESC= SphinxSE engine SPIDER_DESC= Partitioning and XA-transactions engine WSREP_DESC= Build wsrep clustering ZMQ_DESC= ZeroMQ support .endif CMAKE_ARGS+= -DCMAKE_PREFIX_PATH=${PREFIX} \ -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ -DINSTALL_INFODIR="info" \ -DINSTALL_LIBDIR="lib/mysql" \ -DINSTALL_MANDIR="share/man" \ -DINSTALL_MYSQLDATADIR="${MARIADB_DBDIR}" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ -DINSTALL_MYSQLTESTDIR= \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SQLBENCHDIR= \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DINSTALL_SYSCONFDIR="${ETCDIR}" \ -DINSTALL_SYSCONF2DIR="${ETCDIR}/conf.d" \ -DINSTALL_UNIX_ADDRDIR="${MARIADB_RUNDIR}/${MARIADB_SOCK}" \ -DWITH_PCRE=system \ -DPCRE_LIBRARY_DIRS=${PREFIX}/lib \ -DWITH_LIBFMT=system \ -DLIBFMT_INCLUDE_DIR=${PREFIX}/include \ -DHAVE_SYSTEM_LIBFMT=yes \ -DWITH_SSL="${OPENSSLBASE}" \ -DGRN_WITH_LZ4=ON -DWITH_INNODB_LZ4=ON -DWITH_ROCKSDB_LZ4=ON \ -DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \ -DCURSES_FORM_LIBRARY="/usr/lib/libform.so" \ -DCURSES_CURSES_LIBRARY="/usr/lib/libncurses.so" \ -DKRB5_CONFIG="${KRB5CONFIG}" \ -DCURSES_NCURSES_LIBRARY="${NCURSESLIB}/libncurses.so" \ -DCOMPILATION_COMMENT="FreeBSD Ports" \ -DPLUGIN_AUTH_TEST_PLUGIN=NO CMAKE_OFF+= CONC_WITH_UNIT_TESTS CONNECT_WITH_MONGO WITH_UNIT_TESTS CMAKE_ON+= WITH_LIBWRAP WITHOUT_DOCS DISABLED_PLUGINS+= AUTH_TEST_PLUGIN DAEMON_EXAMPLE DIALOG_EXAMPLES \ EXAMPLE EXAMPLE_KEY_MANAGEMENT FTEXAMPLE DATADIR= ${PREFIX}/share/mysql ETCDIR= ${PREFIX}/etc/mysql CONFLICTS_INSTALL= mariadb10[0-57-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysqlwsrep* \ percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* FASTMTX_CMAKE_BOOL= WITH_FAST_MUTEXES GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_USES= gssapi:mit GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF OPTIONS_SUB= yes SUB_LIST+= MARIADB_RUNDIR="${MARIADB_RUNDIR}" \ MARIADB_SOCK="${MARIADB_SOCK}" .if ${PKGNAMESUFFIX:M*-connector-c} WRKSRC= ${WRKDIR}/mariadb-${PORTVERSION}/libmariadb .elif ${PKGNAMESUFFIX:M*-client} # MySQL-Client part CMAKE_ON+= CONC_WITH_MYSQLCOMPAT WITHOUT_SERVER CMAKE_OFF+= WITH_WSREP USES+= readline USE_LDCONFIG= ${PREFIX}/lib/mysql SUB_FILES+= my.cnf.sample client.cnf.sample .else # ! ${PKGNAMESUFFIX:M*-client} # MySQL-Server part USES+= mysql:114m USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin USE_RC_SUBR= mysql-server CMAKE_ON+= CMAKE_SKIP_BUILD_RPATH WITH_EMBEDDED_SERVER CMAKE_OFF+= WITH_CLIENT SUB_FILES+= server.cnf.sample SUB_LIST+= MARIADB_DBDIR="${MARIADB_DBDIR}" \ MARIADB_LOGDIR="${MARIADB_LOGDIR}" \ MARIADB_USER="${MARIADB_USER}" PLIST_SUB+= MARIADB_LOGDIR="${MARIADB_LOGDIR}" \ MARIADB_USER="${MARIADB_USER}" \ MARIADB_GROUP="${MARIADB_GROUP}" .for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE} ${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO ${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC .endfor AWS_KEY_MGMT_CMAKE_ON= -DPLUGIN_AWS_KEY_MANAGEMENT=ON INNOBASE_VARS_OFF= disabled_plugins+=INNOBASE #COLUMNSTORE_BROKEN= ColumnStore engine build failure "fatal error: 'sys/prctl.h' file not found" CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC CONNECT_EXTRA_USE= gnome=libxml2 CONNECT_EXTRA_USES= gnome CONNECT_EXTRA_CMAKE_BOOL= CONNECT_WITH_LIBXML2 CONNECT_WITH_ODBC GSSAPI_NONE_VARS= disabled_plugins+=AUTH_GSSAPI HASHICORP_VAULT_CMAKE_OFF= -DPLUGIN_HASHICORP_KEY_MANAGEMENT=OFF HASHICORP_VAULT_LIB_DEPENDS= libcurl.so:ftp/curl LZO_CMAKE_ON= -DWITH_INNODB_LZO=ON LZO_CMAKE_OFF= -DWITH_INNODB_LZO=OFF LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2 MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack-c OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libJudy.so:devel/judy ROCKSDB_USES= python ROCKSDB_CMAKE_ON= -DPYTHON_SHEBANG=${PYTHON_CMD} -DWITH_ROCKSDB_zstd=ON S3_LIB_DEPENDS= libcurl.so:ftp/curl SNAPPY_CMAKE_ON= -DWITH_INNODB_SNAPPY=ON -DWITH_ROCKSDB_snappy=ON SNAPPY_CMAKE_OFF= -DWITH_INNODB_SNAPPY=OFF -DWITH_ROCKSDB_snappy=OFF SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy WSREP_CMAKE_BOOL= WITH_WSREP WSREP_LIB_DEPENDS= libgalera.so:databases/galera26 WSREP_RUN_DEPENDS= bash:shells/bash \ rsync:net/rsync \ #stunnel:security/stunnel WSREP_SHEBANG_FILES= bin/wsrep_sst_rsync ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4 .for PLUGIN in ${DISABLED_PLUGINS} CMAKE_ARGS+= -DPLUGIN_${PLUGIN}=NO .endfor .endif # ${PKGNAMESUFFIX:M*-client} .include .if ${OPSYS} == FreeBSD SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" .else SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " .endif .if ${SSL_DEFAULT} != base && ${PORT_OPTIONS:MGSSAPI_BASE} GSSAPI_BASE_IGNORE= GSSAPI_BASE is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system .endif .if ${SSL_DEFAULT:Mlibressl*} CFLAGS+= -Wno-incompatible-function-pointer-types .warning HELLO FROM MAKE LIBRESSL .endif .if ${ARCH} != amd64 && ${ARCH} != aarch64 PLIST_SUB+= WSREP="@comment " .endif post-patch: .if ${OPSYS} == DragonFly ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ ${WRKSRC}/cmake/os/DragonFly.cmake .endif pre-install: ${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d .if ${PKGNAMESUFFIX:M*-client} post-install: ${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample ${INSTALL_DATA} ${WRKDIR}/client.cnf.sample \ ${STAGEDIR}${ETCDIR}/conf.d/client.cnf.sample ${RM} -r ${STAGEDIR}${DATADIR} \ ${STAGEDIR}${PREFIX}/include/mysql/server \ ${STAGEDIR}${ETCDIR}/init.d \ ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig post-install-GSSAPI_NONE-off: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so .else # ! ${PKGNAMESUFFIX:M*-client} post-install: ${INSTALL_DATA} ${WRKDIR}/server.cnf.sample \ ${STAGEDIR}${ETCDIR}/conf.d/server.cnf.sample ${MV} ${STAGEDIR}${PREFIX}/share/user_map.conf \ ${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf.sample ${MV} ${STAGEDIR}${PREFIX}/share/pam_user_map.so \ ${STAGEDIR}${PREFIX}/lib/mysql/ ${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \ ${STAGEDIR}${PREFIX}/include/mysql/server/private \ ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig \ ${STAGEDIR}${PREFIX}/libexec/rcmysql \ ${STAGEDIR}/suite \ ${STAGEDIR}${ETCDIR}/init.d \ ${STAGEDIR}${ETCDIR}/logrotate.d \ ${STAGEDIR}${DOCSDIR}/COPYING + ${MV} ${STAGEDIR}${ETCDIR}/conf.d/mysql-clients.cnf \ + ${STAGEDIR}${ETCDIR}/conf.d/mysql-clients.cnf.sample ${MKDIR} ${STAGEDIR}${MARIADB_LOGDIR} ${SED} '/%%/d;/^@comment /d;s/^/@comment /' ${PORTSDIR}/${CATEGORIES:[1]}/${PORTNAME}${PKGNAMESUFFIX:S/-server/-client/}/pkg-plist \ >> ${TMPPLIST} +post-install-HASHICORP_VAULT-on: + ${MV} ${STAGEDIR}${ETCDIR}/conf.d/hashicorp_key_management.cnf \ + ${STAGEDIR}${ETCDIR}/conf.d/hashicorp_key_management.cnf.sample + post-install-MROONGA-on: ${MV} ${STAGEDIR}${PREFIX}/share/groonga/README.md ${STAGEDIR}${DOCSDIR}/README-groonga.md ${RM} -r ${STAGEDIR}${PREFIX}/share/groonga ${RM} ${STAGEDIR}${DATADIR}/mroonga/COPYING +post-install-S3-on: + ${MV} ${STAGEDIR}${ETCDIR}/conf.d/s3.cnf \ + ${STAGEDIR}${ETCDIR}/conf.d/s3.cnf.sample + post-install-SPIDER-on: ${MV} ${STAGEDIR}${ETCDIR}/conf.d/spider.cnf \ ${STAGEDIR}${ETCDIR}/conf.d/spider.cnf.sample post-install-WSREP-on: ${MV} ${STAGEDIR}${DATADIR}/wsrep.cnf \ ${STAGEDIR}${ETCDIR}/conf.d/wsrep.cnf.sample .endif # ${PKGNAMESUFFIX:M*-client} .include diff --git a/databases/mariadb114-server/distinfo b/databases/mariadb114-server/distinfo index 87493a0396ee..7cf506b1f49a 100644 --- a/databases/mariadb114-server/distinfo +++ b/databases/mariadb114-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1718527565 -SHA256 (mariadb-11.4.2.tar.gz) = 8c600e38adb899316c1cb11c68b87979668f4fb9d858000e347e6d8b7abe51b0 -SIZE (mariadb-11.4.2.tar.gz) = 107373265 +TIMESTAMP = 1723390111 +SHA256 (mariadb-11.4.3.tar.gz) = 6f0017b9901bb1897de0eed21caef9ffa9d66ef559345a0d8a6f011308413ece +SIZE (mariadb-11.4.3.tar.gz) = 108166685 diff --git a/databases/mariadb114-server/files/patch-mysys__ssl_openssl.c b/databases/mariadb114-server/files/patch-mysys__ssl_openssl.c index dd66a716fa84..8a141435bd67 100644 --- a/databases/mariadb114-server/files/patch-mysys__ssl_openssl.c +++ b/databases/mariadb114-server/files/patch-mysys__ssl_openssl.c @@ -1,14 +1,29 @@ --- mysys_ssl/openssl.c.orig 2024-02-01 17:44:37 UTC +++ mysys_ssl/openssl.c @@ -30,6 +30,11 @@ int check_openssl_compatibility() { return 0; } +#elif defined(LIBRESSL_VERSION_NUMBER) +int check_openssl_compatibility() +{ + return 0; +} #else #include +@@ -36,8 +36,12 @@ + static uint testing; + static size_t alloc_size, alloc_count; + +-static void *coc_malloc(size_t size, const char *f __attribute__((unused)), +- int l __attribute__((unused))) ++static void *coc_malloc(size_t size ++#if !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x30500000L) ++ , const char *f __attribute__((unused)), ++ int l __attribute__((unused)) ++#endif ++) + { + if (unlikely(testing)) + { diff --git a/databases/mariadb114-server/files/patch-storage_columnstore-tr1 b/databases/mariadb114-server/files/patch-storage_columnstore-tr1 new file mode 100644 index 000000000000..863acf8fe0c5 --- /dev/null +++ b/databases/mariadb114-server/files/patch-storage_columnstore-tr1 @@ -0,0 +1,689 @@ +--- storage/columnstore/columnstore/datatypes/mcs_datatype.cpp.orig 2024-05-26 18:15:40 UTC ++++ storage/columnstore/columnstore/datatypes/mcs_datatype.cpp +@@ -19,12 +19,12 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include + #include +-#include ++#include + #include + #include + using namespace std; +--- storage/columnstore/columnstore/dbcon/joblist/largehashjoin.h.orig 2024-05-26 18:15:40 UTC ++++ storage/columnstore/columnstore/dbcon/joblist/largehashjoin.h +@@ -32,7 +32,7 @@ + #include + #include + #include +-#include ++#include + + #include + #include +--- storage/columnstore/columnstore/dbcon/joblist/lbidlist.h.orig 2024-05-26 18:15:40 UTC ++++ storage/columnstore/columnstore/dbcon/joblist/lbidlist.h +@@ -31,7 +31,7 @@ + #include "bytestream.h" + #include + #include "brm.h" +-#include ++#include + + namespace joblist + { +--- storage/columnstore/columnstore/dbcon/joblist/primitivestep.h.orig 2024-05-26 18:15:40 UTC ++++ storage/columnstore/columnstore/dbcon/joblist/primitivestep.h +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + + #include + +--- storage/columnstore/columnstore/dbcon/joblist/tupleannexstep.cpp.orig 2024-05-26 18:15:40 UTC ++++ storage/columnstore/columnstore/dbcon/joblist/tupleannexstep.cpp +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + using namespace std; + + #include +--- storage/columnstore/columnstore/dbcon/joblist/tupleunion.h.orig 2024-05-26 18:15:40 UTC ++++ storage/columnstore/columnstore/dbcon/joblist/tupleunion.h +@@ -28,7 +28,7 @@ + // + + #include "jobstep.h" +-#include ++#include + + #include "stlpoolallocator.h" + #include "threadnaming.h" +--- storage/columnstore/columnstore/dbcon/mysql/ha_mcs_ddl.cpp.orig 2024-05-26 18:15:40 UTC ++++ storage/columnstore/columnstore/dbcon/mysql/ha_mcs_ddl.cpp +@@ -25,13 +25,13 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include + #include + #include +-#include ++#include + #include + #include + using namespace std; +--- storage/columnstore/columnstore/dbcon/mysql/ha_mcs_dml.cpp.orig 2024-05-26 18:15:40 UTC ++++ storage/columnstore/columnstore/dbcon/mysql/ha_mcs_dml.cpp +@@ -25,8 +25,8 @@ + #include + #include + #include +-#include +-#include ++#include ++#include + #include + #include + #include +--- storage/columnstore/columnstore/dbcon/mysql/ha_mcs_execplan.cpp.orig 2024-05-26 18:15:40 UTC ++++ storage/columnstore/columnstore/dbcon/mysql/ha_mcs_execplan.cpp +@@ -21,8 +21,8 @@ + #include + #include + #include +-#include +-#include ++#include ++#include + #include + #include + #include +--- storage/columnstore/columnstore/dbcon/mysql/ha_mcs_impl.cpp.orig 2024-05-26 18:15:40 UTC ++++ storage/columnstore/columnstore/dbcon/mysql/ha_mcs_impl.cpp +@@ -22,8 +22,8 @@ + #include + #include + #include +-#include +-#include ++#include ++#include + #include + #include + #include +--- storage/columnstore/columnstore/dbcon/mysql/ha_mcs_impl_if.h.orig 2024-05-26 18:15:40 UTC ++++ storage/columnstore/columnstore/dbcon/mysql/ha_mcs_impl_if.h +@@ -21,7 +21,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- storage/columnstore/columnstore/dbcon/mysql/ha_mcs_udf.cpp.orig 2024-05-26 18:15:40 UTC ++++ storage/columnstore/columnstore/dbcon/mysql/ha_mcs_udf.cpp +@@ -21,7 +21,7 @@ + */ + + #include +-#include ++#include + using namespace std; + + #include "idb_mysql.h" +--- storage/columnstore/columnstore/primitives/blockcache/filebuffermgr.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/primitives/blockcache/filebuffermgr.h +@@ -26,7 +26,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + +--- storage/columnstore/columnstore/primitives/blockcache/iomanager.cpp.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/primitives/blockcache/iomanager.cpp +@@ -48,8 +48,8 @@ + #include + #include + #include +-#include +-#include ++#include ++#include + #include + #include + #include +--- storage/columnstore/columnstore/primitives/linux-port/primitiveprocessor.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/primitives/linux-port/primitiveprocessor.h +@@ -27,7 +27,7 @@ + + #include + #include +-#include ++#include + + #define POSIX_REGEX + +--- storage/columnstore/columnstore/primitives/primproc/batchprimitiveprocessor.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/primitives/primproc/batchprimitiveprocessor.h +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + #include + + #include "errorcodes.h" +--- storage/columnstore/columnstore/primitives/primproc/bppseeder.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/primitives/primproc/bppseeder.h +@@ -34,7 +34,7 @@ + #include + #include + #include +-#include ++#include + #include + + #include "batchprimitiveprocessor.h" +--- storage/columnstore/columnstore/primitives/primproc/primitiveserver.cpp.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/primitives/primproc/primitiveserver.cpp +@@ -36,8 +36,8 @@ + #include + #include + #include +-#include +-#include ++#include ++#include + #include + #include + +--- storage/columnstore/columnstore/primitives/primproc/primitiveserver.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/primitives/primproc/primitiveserver.h +@@ -25,8 +25,8 @@ + #pragma once + + #include +-#include +-#include ++#include ++#include + #include + #include + +--- storage/columnstore/columnstore/primitives/primproc/primproc.cpp.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/primitives/primproc/primproc.cpp +@@ -31,7 +31,7 @@ + #include + #include + #include +-#include ++#include + + #include + #include +--- storage/columnstore/columnstore/storage-manager/src/SessionManager.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/storage-manager/src/SessionManager.h +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + + namespace storagemanager + { +--- storage/columnstore/columnstore/utils/common/threadnaming.cpp.orig 2022-05-18 08:34:17 UTC ++++ storage/columnstore/columnstore/utils/common/threadnaming.cpp +@@ -22,13 +22,21 @@ namespace utils + { + void setThreadName(const char* threadName) + { ++#ifdef __FreeBSD__ ++ pthread_set_name_np(pthread_self(), threadName); ++#else + prctl(PR_SET_NAME, threadName, 0, 0, 0); ++#endif + } + + std::string getThreadName() + { + char buf[32]; ++#ifdef __FreeBSD__ ++ pthread_get_name_np(pthread_self(), buf, sizeof(buf)); ++#else + prctl(PR_GET_NAME, buf, 0, 0, 0); ++#endif + return std::string(buf); + } + } // namespace utils +--- storage/columnstore/columnstore/utils/configcpp/configcpp.cpp.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/utils/configcpp/configcpp.cpp +@@ -57,7 +57,7 @@ namespace fs = boost::filesystem; + + #include "exceptclasses.h" + #include "installdir.h" +-#include ++#include + + #include "bytestream.h" + +--- storage/columnstore/columnstore/utils/configcpp/writeonce.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/utils/configcpp/writeonce.h +@@ -25,7 +25,7 @@ + #pragma once + + #include +-#include ++#include + + #include + +--- storage/columnstore/columnstore/utils/funcexp/funcexp.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/utils/funcexp/funcexp.h +@@ -26,7 +26,7 @@ + + #include + #include +-#include ++#include + #include + + #include "rowgroup.h" +--- storage/columnstore/columnstore/utils/joiner/joiner.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/utils/joiner/joiner.h +@@ -21,7 +21,7 @@ + #include + #include + +-#include ++#include + + #include "../common/simpleallocator.h" + #include "../joblist/elementtype.h" +--- storage/columnstore/columnstore/utils/joiner/tuplejoiner.cpp.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/utils/joiner/tuplejoiner.cpp +@@ -20,7 +20,7 @@ + #include + #include + #include +-#include ++#include + + #include "hasher.h" + #include "lbidlist.h" +--- storage/columnstore/columnstore/utils/joiner/tuplejoiner.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/utils/joiner/tuplejoiner.h +@@ -24,7 +24,7 @@ + #include + + #include +-#include ++#include + + #include "rowgroup.h" + #include "joiner.h" +--- storage/columnstore/columnstore/utils/regr/corr.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/utils/regr/corr.h +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + + #include "mcsv1_udaf.h" + #include "calpontsystemcatalog.h" +--- storage/columnstore/columnstore/utils/regr/covar_pop.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/utils/regr/covar_pop.h +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + + #include "mcsv1_udaf.h" + #include "calpontsystemcatalog.h" +--- storage/columnstore/columnstore/utils/regr/covar_samp.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/utils/regr/covar_samp.h +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + + #include "mcsv1_udaf.h" + #include "calpontsystemcatalog.h" +--- storage/columnstore/columnstore/utils/regr/regr_avgx.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/utils/regr/regr_avgx.h +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + + #include "mcsv1_udaf.h" + #include "calpontsystemcatalog.h" +--- storage/columnstore/columnstore/utils/regr/regr_avgy.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/utils/regr/regr_avgy.h +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + + #include "mcsv1_udaf.h" + #include "calpontsystemcatalog.h" +--- storage/columnstore/columnstore/utils/regr/regr_count.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/utils/regr/regr_count.h +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + + #include "mcsv1_udaf.h" + #include "calpontsystemcatalog.h" +--- storage/columnstore/columnstore/utils/regr/regr_intercept.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/utils/regr/regr_intercept.h +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + + #include "mcsv1_udaf.h" + #include "calpontsystemcatalog.h" +--- storage/columnstore/columnstore/utils/regr/regr_r2.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/utils/regr/regr_r2.h +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + + #include "mcsv1_udaf.h" + #include "calpontsystemcatalog.h" +--- storage/columnstore/columnstore/utils/regr/regr_slope.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/utils/regr/regr_slope.h +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + + #include "mcsv1_udaf.h" + #include "calpontsystemcatalog.h" +--- storage/columnstore/columnstore/utils/regr/regr_sxx.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/utils/regr/regr_sxx.h +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + + #include "mcsv1_udaf.h" + #include "calpontsystemcatalog.h" +--- storage/columnstore/columnstore/utils/regr/regr_sxy.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/utils/regr/regr_sxy.h +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + + #include "mcsv1_udaf.h" + #include "calpontsystemcatalog.h" +--- storage/columnstore/columnstore/utils/regr/regr_syy.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/utils/regr/regr_syy.h +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + + #include "mcsv1_udaf.h" + #include "calpontsystemcatalog.h" +--- storage/columnstore/columnstore/utils/rowgroup/rowaggregation.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/utils/rowgroup/rowaggregation.h +@@ -32,8 +32,8 @@ + #include + #include + #include +-#include +-#include ++#include ++#include + #include + + #include +--- storage/columnstore/columnstore/utils/rwlock/rwlock.cpp.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/utils/rwlock/rwlock.cpp +@@ -26,7 +26,7 @@ + #include + #include + #include +-#include ++#include + + #ifndef NDEBUG + #define NDEBUG +--- storage/columnstore/columnstore/utils/testbc/filebuffermgr.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/utils/testbc/filebuffermgr.h +@@ -27,7 +27,7 @@ + #include "blocksize.h" + #include "filebuffer.h" + #include "rwlock_local.h" +-#include ++#include + #include + + /** +--- storage/columnstore/columnstore/utils/udfsdk/allnull.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/utils/udfsdk/allnull.h +@@ -47,7 +47,7 @@ + #include + #include + #include +-#include ++#include + + #include "mcsv1_udaf.h" + #include "calpontsystemcatalog.h" +--- storage/columnstore/columnstore/utils/udfsdk/avg_mode.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/utils/udfsdk/avg_mode.h +@@ -55,7 +55,7 @@ + #include + #include + #include +-#include ++#include + + #include "mcsv1_udaf.h" + #include "calpontsystemcatalog.h" +--- storage/columnstore/columnstore/utils/udfsdk/avgx.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/utils/udfsdk/avgx.h +@@ -34,7 +34,7 @@ + #include + #include + #include +-#include ++#include + + #include "mcsv1_udaf.h" + #include "calpontsystemcatalog.h" +--- storage/columnstore/columnstore/utils/udfsdk/mcsv1_udaf.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/utils/udfsdk/mcsv1_udaf.h +@@ -67,7 +67,7 @@ + #include + #include + #include +-#include ++#include + #include "any.hpp" + #include "calpontsystemcatalog.h" + #include "wf_frame.h" +--- storage/columnstore/columnstore/utils/udfsdk/median.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/utils/udfsdk/median.h +@@ -55,7 +55,7 @@ + #include + #include + #include +-#include ++#include + + #include "mcsv1_udaf.h" + #include "calpontsystemcatalog.h" +--- storage/columnstore/columnstore/utils/udfsdk/ssq.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/utils/udfsdk/ssq.h +@@ -55,7 +55,7 @@ + #include + #include + #include +-#include ++#include + + #include "mcsv1_udaf.h" + #include "calpontsystemcatalog.h" +--- storage/columnstore/columnstore/utils/windowfunction/idborderby.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/utils/windowfunction/idborderby.h +@@ -29,7 +29,7 @@ + + #include + +-#include ++#include + + #include "rowgroup.h" + #include "hasher.h" +--- storage/columnstore/columnstore/utils/windowfunction/wf_udaf.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/utils/windowfunction/wf_udaf.h +@@ -19,7 +19,7 @@ + + #pragma once + +-#include ++#include + #include "windowfunctiontype.h" + #include "mcsv1_udaf.h" + +--- storage/columnstore/columnstore/versioning/BRM/brmtypes.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/versioning/BRM/brmtypes.h +@@ -33,7 +33,7 @@ + #include "mcs_basic_types.h" + #include "logicalpartition.h" + +-#include ++#include + #ifndef _UNORDERED_MAP_FIX_ + #define _UNORDERED_MAP_FIX_ + #endif //_UNORDERED_MAP_FIX_ +--- storage/columnstore/columnstore/versioning/BRM/extentmap.cpp.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/versioning/BRM/extentmap.cpp +@@ -38,7 +38,7 @@ + #include + #include + #include +-#include ++#include + + #include + #include +--- storage/columnstore/columnstore/versioning/BRM/extentmap.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/versioning/BRM/extentmap.h +@@ -31,7 +31,7 @@ + #include + #include + #include +-#include ++#include + #include + + // #define NDEBUG +--- storage/columnstore/columnstore/versioning/BRM/lbidresourcegraph.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/versioning/BRM/lbidresourcegraph.h +@@ -28,7 +28,7 @@ + + #include + #include +-#include ++#include + #include + + #include "brmtypes.h" +--- storage/columnstore/columnstore/writeengine/bulk/we_colextinf.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/writeengine/bulk/we_colextinf.h +@@ -30,7 +30,7 @@ + #include + #include + #include +-#include ++#include + #include + + #include "brmtypes.h" +--- storage/columnstore/columnstore/writeengine/bulk/we_extentstripealloc.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/writeengine/bulk/we_extentstripealloc.h +@@ -29,7 +29,7 @@ + #include + #include + +-#include ++#include + #include + + #include "we_type.h" +--- storage/columnstore/columnstore/writeengine/shared/we_cache.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/writeengine/shared/we_cache.h +@@ -26,7 +26,7 @@ + #if __GNUC__ == 4 && __GNUC_MINOR__ < 2 + #include + #else +-#include ++#include + #endif + #include + +--- storage/columnstore/columnstore/writeengine/wrapper/writeengine.h.orig 2024-05-26 18:15:41 UTC ++++ storage/columnstore/columnstore/writeengine/wrapper/writeengine.h +@@ -29,7 +29,7 @@ + #include + // end + #include +-#include ++#include + + #include "we_brm.h" + #include "we_colop.h" diff --git a/databases/mariadb114-server/files/pkg-message.in b/databases/mariadb114-server/files/pkg-message.in index 8589380d09d6..7e7b5d96cd02 100644 --- a/databases/mariadb114-server/files/pkg-message.in +++ b/databases/mariadb114-server/files/pkg-message.in @@ -1,28 +1,30 @@ [ { type: install message: < flag) the first time you start the MySQL server after an upgrade from an earlier version. EOM } ] diff --git a/databases/mariadb114-server/files/server.cnf.sample.in b/databases/mariadb114-server/files/server.cnf.sample.in index 9e84965c7679..85b6bcbb016d 100644 --- a/databases/mariadb114-server/files/server.cnf.sample.in +++ b/databases/mariadb114-server/files/server.cnf.sample.in @@ -1,60 +1,50 @@ # Options specific to server applications, see # https://mariadb.com/kb/en/configuring-mariadb-with-option-files/#server-option-groups # Options specific to all server programs [server] # Options specific to MariaDB server programs [server-mariadb] # # Options for specific server tools # [mysqld] user = %%MARIADB_USER%% # port = 3306 # inherited from %%ETCDIR%%/my.cnf # socket = %%MARIADB_RUNDIR%%/mysql.sock # inherited from %%ETCDIR%%/my.cnf bind-address = 127.0.0.1 basedir = %%PREFIX%% -datadir = %%MARIADB_DBDIR%% +# datadir = %%MARIADB_DBDIR%% # set with --db_dir from rc-script net_retry_count = 16384 log_error = %%MARIADB_LOGDIR%%/mysqld.err # [mysqld] configuration for ZFS # From https://www.percona.com/resources/technical-presentations/zfs-mysql-percona-technical-webinar # Create separate datasets for data and logs, eg # zroot/mysql compression=on recordsize=128k atime=off # zroot/mysql/data recordsize=16k # zroot/mysql/logs # datadir = %%MARIADB_DBDIR%%/data # innodb_log_group_home_dir = %%MARIADB_DBDIR%%/log # audit_log_file = %%MARIADB_DBDIR%%/log/audit.log # general_log_file = %%MARIADB_DBDIR%%/log/general.log # log_bin = %%MARIADB_DBDIR%%/log/mysql-bin # relay_log = %%MARIADB_DBDIR%%/log/relay-log # slow_query_log_file = %%MARIADB_DBDIR%%/log/slow.log # innodb_doublewrite = 0 # innodb_flush_method = O_DSYNC -# Options read by `mariadb_safe` -# Renamed from [mysqld_safe] starting with MariaDB 10.4.6. +# Options read by `mariadb-safe` (and `mysql_safe`) [mariadb-safe] # Options read my `mariabackup` [mariabackup] -# Options read by `mysql_upgrade` -# Renamed from [mysql_upgrade] starting with MariaDB 10.4.6. +# Options read by mariadb-upgrade (and `mysql_upgrade`) [mariadb-upgrade] # Specific options read by the mariabackup SST method [sst] -# Options read by `mysqlbinlog` -# Renamed from [mysqlbinlog] starting with MariaDB 10.4.6. -[mariadb-binlog] - -# Options read by `mysqladmin` -# Renamed from [mysqladmin] starting with MariaDB 10.4.6. -[mariadb-admin] - diff --git a/databases/mariadb114-server/pkg-plist b/databases/mariadb114-server/pkg-plist index 0ffab4452325..df8d54cea704 100644 --- a/databases/mariadb114-server/pkg-plist +++ b/databases/mariadb114-server/pkg-plist @@ -1,353 +1,353 @@ bin/aria_chk bin/aria_dump_log bin/aria_ftdump bin/aria_pack bin/aria_read_log %%S3%%bin/aria_s3_copy %%INNOBASE%%bin/innochecksum %%INNOBASE%%bin/mariabackup bin/mariadb-backup bin/mariadb-client-test bin/mariadb-client-test-embedded bin/mariadb-embedded bin/mariadb-fix-extensions bin/mariadb-install-db %%ROCKSDB%%bin/mariadb-ldb bin/mariadb-test-embedded bin/mariadb-tzinfo-to-sql bin/mariadb-upgrade bin/mariadbd-multi bin/mariadbd-safe bin/mariadbd-safe-helper %%INNOBASE%%bin/mbstream bin/myisam_ftdump bin/myisamchk bin/myisamlog bin/myisampack @comment bin/mytop %%ROCKSDB%%bin/myrocks_hotbackup bin/mysql_client_test bin/mysql_client_test_embedded bin/mysql_embedded bin/mysql_fix_extensions bin/mysql_install_db %%ROCKSDB%%bin/mysql_ldb bin/mysql_tzinfo_to_sql bin/mysql_upgrade bin/mysqld_multi bin/mysqld_safe bin/mysqld_safe_helper bin/mysqltest_embedded bin/perror bin/resolveip %%ROCKSDB%%bin/sst_dump bin/test-connect-t %%WSREP%%bin/wsrep_sst_common %%WSREP%%bin/wsrep_sst_mariabackup %%WSREP%%bin/wsrep_sst_mysqldump %%WSREP%%bin/wsrep_sst_rsync %%WSREP%%bin/wsrep_sst_rsync_wan %%WSREP%%bin/wsrep_sst_backup %%ETCDIR%%/conf.d/enable_encryption.preset -%%HASHICORP_VAULT%%%%ETCDIR%%/conf.d/hashicorp_key_management.cnf -%%ETCDIR%%/conf.d/mysql-clients.cnf +%%HASHICORP_VAULT%%@sample %%ETCDIR%%/conf.d/hashicorp_key_management.cnf.sample +@sample %%ETCDIR%%/conf.d/mysql-clients.cnf.sample %%ETCDIR%%/conf.d/provider_bzip2.cnf %%ETCDIR%%/conf.d/provider_lz4.cnf %%ETCDIR%%/conf.d/provider_lzma.cnf %%LZO%%%%ETCDIR%%/conf.d/provider_lzo.cnf %%SNAPPY%%%%ETCDIR%%/conf.d/provider_snappy.cnf -%%S3%%%%ETCDIR%%/conf.d/s3.cnf +%%S3%%@sample %%ETCDIR%%/conf.d/s3.cnf.sample @sample %%ETCDIR%%/conf.d/server.cnf.sample %%SPIDER%%@sample %%ETCDIR%%/conf.d/spider.cnf.sample -%%WSREP%%%%ETCDIR%%/conf.d/wsrep.cnf.sample +%%WSREP%%@sample %%ETCDIR%%/conf.d/wsrep.cnf.sample @comment %%ETCDIR%%/my.cnf @comment %%ETCDIR%%/conf.d/client.cnf @sample %%ETCDIR%%/user_map.conf.sample include/mysql/server/big_endian.h include/mysql/server/byte_order_generic.h include/mysql/server/byte_order_generic_x86.h include/mysql/server/byte_order_generic_x86_64.h include/mysql/server/decimal.h include/mysql/server/errmsg.h include/mysql/server/handler_ername.h include/mysql/server/handler_state.h include/mysql/server/json_lib.h include/mysql/server/keycache.h include/mysql/server/little_endian.h include/mysql/server/m_ctype.h include/mysql/server/m_string.h include/mysql/server/ma_dyncol.h include/mysql/server/mariadb_capi_rename.h include/mysql/server/my_alloc.h include/mysql/server/my_alloca.h include/mysql/server/my_attribute.h include/mysql/server/my_byteorder.h include/mysql/server/my_compiler.h include/mysql/server/my_config.h include/mysql/server/my_dbug.h include/mysql/server/my_decimal_limits.h include/mysql/server/my_dir.h include/mysql/server/my_getopt.h include/mysql/server/my_global.h include/mysql/server/my_list.h include/mysql/server/my_net.h include/mysql/server/my_pthread.h include/mysql/server/my_sys.h include/mysql/server/my_valgrind.h include/mysql/server/my_xml.h include/mysql/server/mysql.h include/mysql/server/mysql/auth_dialog_client.h include/mysql/server/mysql/client_plugin.h include/mysql/server/mysql/plugin.h include/mysql/server/mysql/plugin_audit.h include/mysql/server/mysql/plugin_auth.h include/mysql/server/mysql/plugin_auth_common.h include/mysql/server/mysql/plugin_data_type.h include/mysql/server/mysql/plugin_encryption.h include/mysql/server/mysql/plugin_ftparser.h include/mysql/server/mysql/plugin_function.h include/mysql/server/mysql/plugin_password_validation.h include/mysql/server/mysql/psi/mysql_file.h include/mysql/server/mysql/psi/mysql_idle.h include/mysql/server/mysql/psi/mysql_mdl.h include/mysql/server/mysql/psi/mysql_memory.h include/mysql/server/mysql/psi/mysql_ps.h include/mysql/server/mysql/psi/mysql_socket.h include/mysql/server/mysql/psi/mysql_sp.h include/mysql/server/mysql/psi/mysql_stage.h include/mysql/server/mysql/psi/mysql_statement.h include/mysql/server/mysql/psi/mysql_table.h include/mysql/server/mysql/psi/mysql_thread.h include/mysql/server/mysql/psi/mysql_transaction.h include/mysql/server/mysql/psi/psi.h include/mysql/server/mysql/psi/psi_abi_v0.h include/mysql/server/mysql/psi/psi_abi_v1.h include/mysql/server/mysql/psi/psi_abi_v2.h include/mysql/server/mysql/psi/psi_base.h include/mysql/server/mysql/psi/psi_memory.h include/mysql/server/mysql/service_base64.h include/mysql/server/mysql/service_debug_sync.h include/mysql/server/mysql/service_encryption.h include/mysql/server/mysql/service_encryption_scheme.h include/mysql/server/mysql/service_json.h include/mysql/server/mysql/service_kill_statement.h include/mysql/server/mysql/service_logger.h include/mysql/server/mysql/service_md5.h include/mysql/server/mysql/service_my_crypt.h include/mysql/server/mysql/service_my_print_error.h include/mysql/server/mysql/service_my_snprintf.h include/mysql/server/mysql/service_print_check_msg.h include/mysql/server/mysql/service_progress_report.h include/mysql/server/mysql/service_sha1.h include/mysql/server/mysql/service_sha2.h include/mysql/server/mysql/service_thd_alloc.h include/mysql/server/mysql/service_thd_autoinc.h include/mysql/server/mysql/service_thd_error_context.h include/mysql/server/mysql/service_thd_mdl.h include/mysql/server/mysql/service_thd_rnd.h include/mysql/server/mysql/service_thd_specifics.h include/mysql/server/mysql/service_thd_timezone.h include/mysql/server/mysql/service_thd_wait.h include/mysql/server/mysql/service_sql.h %%WSREP%%include/mysql/server/mysql/service_wsrep.h include/mysql/server/mysql/services.h include/mysql/server/mysql_com.h include/mysql/server/mysql_com_server.h include/mysql/server/mysql_embed.h include/mysql/server/mysql_time.h include/mysql/server/mysql_version.h include/mysql/server/mysqld_ername.h include/mysql/server/mysqld_error.h include/mysql/server/pack.h include/mysql/server/sql_common.h include/mysql/server/sql_state.h include/mysql/server/sslopt-case.h include/mysql/server/sslopt-longopts.h include/mysql/server/sslopt-vars.h include/mysql/server/typelib.h lib/mysql/libmariadbd.a lib/mysql/libmariadbd.so lib/mysql/libmariadbd.so.19 lib/mysql/libmysqld.a lib/mysql/libmysqld.so lib/mysql/pam_user_map.so lib/mysql/plugin/adt_null.so lib/mysql/plugin/auth_0x0100.so lib/mysql/plugin/auth_ed25519.so @comment lib/mysql/plugin/auth_gssapi_client.so %%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi.so lib/mysql/plugin/auth_pam.so lib/mysql/plugin/auth_pam_tool_dir/auth_pam_tool lib/mysql/plugin/auth_pam_v1.so lib/mysql/plugin/debug_key_management.so lib/mysql/plugin/disks.so lib/mysql/plugin/file_key_management.so lib/mysql/plugin/func_test.so lib/mysql/plugin/ha_archive.so lib/mysql/plugin/ha_blackhole.so lib/mysql/plugin/ha_connect.so lib/mysql/plugin/ha_federated.so lib/mysql/plugin/ha_federatedx.so %%MROONGA%%lib/mysql/plugin/ha_mroonga.so %%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so %%ROCKSDB%%lib/mysql/plugin/ha_rocksdb.so %%S3%%lib/mysql/plugin/ha_s3.so %%SPHINX%%lib/mysql/plugin/ha_sphinx.so %%SPIDER%%lib/mysql/plugin/ha_spider.so lib/mysql/plugin/ha_test_sql_discovery.so lib/mysql/plugin/handlersocket.so %%HASHICORP_VAULT%%lib/mysql/plugin/hashicorp_key_management.so lib/mysql/plugin/locales.so lib/mysql/plugin/metadata_lock_info.so lib/mysql/plugin/password_reuse_check.so lib/mysql/plugin/provider_bzip2.so lib/mysql/plugin/provider_lz4.so lib/mysql/plugin/provider_lzma.so %%LZO%%lib/mysql/plugin/provider_lzo.so %%SNAPPY%%lib/mysql/plugin/provider_snappy.so lib/mysql/plugin/qa_auth_client.so lib/mysql/plugin/qa_auth_interface.so lib/mysql/plugin/qa_auth_server.so lib/mysql/plugin/query_cache_info.so lib/mysql/plugin/query_response_time.so lib/mysql/plugin/server_audit.so lib/mysql/plugin/simple_password_check.so lib/mysql/plugin/sql_errlog.so lib/mysql/plugin/test_sql_service.so lib/mysql/plugin/test_versioning.so lib/mysql/plugin/type_mysql_json.so lib/mysql/plugin/type_mysql_timestamp.so lib/mysql/plugin/type_test.so %%WSREP%%lib/mysql/plugin/wsrep_info.so libexec/mariadbd libexec/mysqld @comment %%S3%%share/man/man1/aria_s3_copy.1.gz share/man/man1/aria_chk.1.gz share/man/man1/aria_dump_log.1.gz share/man/man1/aria_ftdump.1.gz share/man/man1/aria_pack.1.gz share/man/man1/aria_read_log.1.gz %%WSREP%%share/man/man1/galera_new_cluster.1.gz %%WSREP%%share/man/man1/galera_recovery.1.gz share/man/man1/innochecksum.1.gz share/man/man1/mariabackup.1.gz share/man/man1/mariadb-backup.1.gz share/man/man1/mariadb-conv.1.gz share/man/man1/mariadb-embedded.1.gz share/man/man1/mariadb-fix-extensions.1.gz share/man/man1/mariadb-install-db.1.gz %%ROCKSDB%%share/man/man1/mariadb-ldb.1.gz share/man/man1/mariadb-service-convert.1.gz share/man/man1/mariadb-upgrade.1.gz share/man/man1/mariadbd-multi.1.gz share/man/man1/mariadbd-safe-helper.1.gz share/man/man1/mariadbd-safe.1.gz share/man/man1/mbstream.1.gz share/man/man1/myisam_ftdump.1.gz share/man/man1/myisamchk.1.gz share/man/man1/myisamlog.1.gz share/man/man1/myisampack.1.gz %%ROCKSDB%%share/man/man1/myrocks_hotbackup.1.gz @comment share/man/man1/mytop.1.gz share/man/man1/mysql.server.1.gz share/man/man1/mysql_fix_extensions.1.gz share/man/man1/mysql_install_db.1.gz share/man/man1/mysql_tzinfo_to_sql.1.gz share/man/man1/mysql_upgrade.1.gz share/man/man1/mysqld_multi.1.gz share/man/man1/mysqld_safe.1.gz share/man/man1/mysqld_safe_helper.1.gz %%ROCKSDB%%share/man/man1/mysql_ldb.1.gz share/man/man1/resolveip.1.gz %%WSREP%%share/man/man1/wsrep_sst_backup.1.gz %%WSREP%%share/man/man1/wsrep_sst_common.1.gz %%WSREP%%share/man/man1/wsrep_sst_mariabackup.1.gz %%WSREP%%share/man/man1/wsrep_sst_mysqldump.1.gz %%WSREP%%share/man/man1/wsrep_sst_rsync.1.gz %%WSREP%%share/man/man1/wsrep_sst_rsync_wan.1.gz share/man/man8/mariadbd.8.gz share/man/man8/mysqld.8.gz share/aclocal/mysql.m4 %%PORTDOCS%%%%DOCSDIR%%/CREDITS %%PORTDOCS%%%%DOCSDIR%%/INSTALL-BINARY %%PORTDOCS%%%%WSREP%%%%DOCSDIR%%/README-wsrep %%PORTDOCS%%%%DOCSDIR%%/README.md %%PORTDOCS%%%%DOCSDIR%%/THIRDPARTY %%MROONGA%%%%PORTDOCS%%%%DOCSDIR%%/README-groonga.md %%MROONGA%%share/groonga-normalizer-mysql/README.md %%MROONGA%%share/groonga-normalizer-mysql/lgpl-2.0.txt %%HASHICORP_VAULT%%%%PORTDOCS%%%%DOCSDIR%%/hashicorp_key_management.txt %%DATADIR%%/binary-configure %%DATADIR%%/bulgarian/errmsg.sys %%DATADIR%%/charsets/Index.xml %%DATADIR%%/charsets/README %%DATADIR%%/charsets/armscii8.xml %%DATADIR%%/charsets/ascii.xml %%DATADIR%%/charsets/cp1250.xml %%DATADIR%%/charsets/cp1251.xml %%DATADIR%%/charsets/cp1256.xml %%DATADIR%%/charsets/cp1257.xml %%DATADIR%%/charsets/cp850.xml %%DATADIR%%/charsets/cp852.xml %%DATADIR%%/charsets/cp866.xml %%DATADIR%%/charsets/dec8.xml %%DATADIR%%/charsets/geostd8.xml %%DATADIR%%/charsets/greek.xml %%DATADIR%%/charsets/hebrew.xml %%DATADIR%%/charsets/hp8.xml %%DATADIR%%/charsets/keybcs2.xml %%DATADIR%%/charsets/koi8r.xml %%DATADIR%%/charsets/koi8u.xml %%DATADIR%%/charsets/latin1.xml %%DATADIR%%/charsets/latin2.xml %%DATADIR%%/charsets/latin5.xml %%DATADIR%%/charsets/latin7.xml %%DATADIR%%/charsets/macce.xml %%DATADIR%%/charsets/macroman.xml %%DATADIR%%/charsets/swe7.xml %%DATADIR%%/chinese/errmsg.sys %%DATADIR%%/czech/errmsg.sys %%DATADIR%%/danish/errmsg.sys %%DATADIR%%/dutch/errmsg.sys %%DATADIR%%/english/errmsg.sys %%DATADIR%%/estonian/errmsg.sys %%DATADIR%%/fill_help_tables.sql %%DATADIR%%/french/errmsg.sys %%DATADIR%%/german/errmsg.sys %%DATADIR%%/georgian/errmsg.sys %%DATADIR%%/greek/errmsg.sys %%DATADIR%%/hindi/errmsg.sys %%DATADIR%%/hungarian/errmsg.sys %%DATADIR%%/italian/errmsg.sys %%DATADIR%%/japanese/errmsg.sys %%DATADIR%%/korean/errmsg.sys %%DATADIR%%/magic %%DATADIR%%/maria_add_gis_sp.sql %%DATADIR%%/maria_add_gis_sp_bootstrap.sql %%DATADIR%%/mariadb.logrotate %%DATADIR%%/mini-benchmark %%MROONGA%%%%DATADIR%%/mroonga/AUTHORS %%MROONGA%%%%DATADIR%%/mroonga/install.sql %%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql %%DATADIR%%/mysql.server %%DATADIR%%/mariadb_performance_tables.sql %%DATADIR%%/mariadb_sys_schema.sql %%DATADIR%%/mariadb_system_tables.sql %%DATADIR%%/mariadb_system_tables_data.sql %%DATADIR%%/mariadb_test_data_timezone.sql %%DATADIR%%/mariadb_test_db.sql %%DATADIR%%/mysqld_multi.server %%DATADIR%%/norwegian-ny/errmsg.sys %%DATADIR%%/norwegian/errmsg.sys %%DATADIR%%/polish/errmsg.sys %%DATADIR%%/portuguese/errmsg.sys %%DATADIR%%/romanian/errmsg.sys %%DATADIR%%/russian/errmsg.sys %%DATADIR%%/serbian/errmsg.sys %%DATADIR%%/slovak/errmsg.sys %%DATADIR%%/spanish/errmsg.sys %%DATADIR%%/swahili/errmsg.sys %%DATADIR%%/swedish/errmsg.sys %%DATADIR%%/ukrainian/errmsg.sys %%WSREP%%%%DATADIR%%/wsrep_notify @dir(%%MARIADB_USER%%,%%MARIADB_GROUP%%,) %%MARIADB_LOGDIR%%