From 26c0bd5097ae26fe2684ee70515a95bb329565bc Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Fri, 14 Oct 2022 07:04:52 +0200 Subject: [PATCH] - up to 8.0.30 - removed obsolete chain-certs patch - added system-xxhash patch --- mysql-chain-certs.patch | 24 ------ mysql-system-xxhash.patch | 168 ++++++++++++++++++++++++++++++++++++++ mysql.spec | 146 ++++++++++++++++++++++++++++----- 3 files changed, 294 insertions(+), 44 deletions(-) delete mode 100644 mysql-chain-certs.patch create mode 100644 mysql-system-xxhash.patch diff --git a/mysql-chain-certs.patch b/mysql-chain-certs.patch deleted file mode 100644 index d18baf6..0000000 --- a/mysql-chain-certs.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix things so that chains of certificates work in the server and client -certificate files. - -This only really works for OpenSSL-based builds, as yassl is unable to read -multiple certificates from a file. The patch below to yassl/src/ssl.cpp -doesn't fix that, but just arranges that the viosslfactories.c patch won't -have any ill effects in a yassl build. Since we don't use yassl in Red Hat/ -Fedora builds, I'm not feeling motivated to try to fix yassl for this. - -See RH bug #598656. Filed upstream at http://bugs.mysql.com/bug.php?id=54158 - - ---- mysql-8.0.20/vio/viosslfactories.cc~ 2020-03-26 14:31:45.000000000 +0100 -+++ mysql-8.0.20/vio/viosslfactories.cc 2020-05-12 18:42:05.355762655 +0200 -@@ -250,7 +250,7 @@ static int vio_set_cert_stuff(SSL_CTX *c - if (!key_file && cert_file) key_file = cert_file; - - if (cert_file && -- SSL_CTX_use_certificate_file(ctx, cert_file, SSL_FILETYPE_PEM) <= 0) { -+ SSL_CTX_use_certificate_chain_file(ctx, cert_file) <= 0) { - *error = SSL_INITERR_CERT; - DBUG_PRINT("error", - ("%s from file '%s'", sslGetErrString(*error), cert_file)); - diff --git a/mysql-system-xxhash.patch b/mysql-system-xxhash.patch new file mode 100644 index 0000000..9ca5514 --- /dev/null +++ b/mysql-system-xxhash.patch @@ -0,0 +1,168 @@ +--- mysql-8.0.30/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc.orig 2022-07-06 23:36:34.000000000 +0200 ++++ mysql-8.0.30/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.cc 2022-10-09 14:33:34.598098038 +0200 +@@ -126,7 +126,7 @@ Gcs_sender_id calculate_sender_id(const + std::string info(node.get_member_id().get_member_id()); + info.append(node.get_member_uuid().actual_value); + +- return GCS_XXH64(info.c_str(), info.size(), 0); ++ return XXH64(info.c_str(), info.size(), 0); + } + + bool Gcs_message_stage_split_v2::update_members_information( +--- mysql-8.0.30/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h.orig 2022-07-06 23:36:34.000000000 +0200 ++++ mysql-8.0.30/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xxhash.h 2022-10-09 08:41:35.109178797 +0200 +@@ -25,10 +25,6 @@ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +-// Define a namespace prefix to all xxhash functions. This is done to +-// avoid conflict with xxhash symbols in liblz4. +-#define XXH_NAMESPACE GCS_ +- +-#include "xxhash.h" ++#include + + #endif // GCS_XXHASH_H_INCLUDED +--- mysql-8.0.30/plugin/group_replication/libmysqlgcs/CMakeLists.txt.orig 2022-07-06 23:36:34.000000000 +0200 ++++ mysql-8.0.30/plugin/group_replication/libmysqlgcs/CMakeLists.txt 2022-10-09 08:42:55.768741827 +0200 +@@ -140,7 +140,6 @@ SET(GCS_SOURCES + src/bindings/xcom/gcs_xcom_statistics_interface.cc + src/bindings/xcom/gcs_xcom_proxy.cc + src/bindings/xcom/gcs_xcom_communication_protocol_changer.cc +- ${BUNDLED_LZ4_PATH}/xxhash.c # required by gcs_message_stage_split + src/bindings/xcom/gcs_message_stage_split.cc + src/bindings/xcom/gcs_xcom_synode.cc + src/bindings/xcom/gcs_xcom_expels_in_progress.cc) +@@ -219,6 +218,7 @@ ADD_LIBRARY(mysqlgcs STATIC ${XCOM_SOURC + # Dependency on mysys from gcs_logging_system.cc + # but pick up symbols from the server: + # TARGET_LINK_LIBRARIES(mysqlgcs mysys) ++TARGET_LINK_LIBRARIES(mysqlgcs xxhash) + + IF(CMAKE_VERSION VERSION_GREATER "3.19" AND NOT APPLE_XCODE) + # New in version 3.19: +--- mysql-8.0.30/sql/CMakeLists.txt.orig 2022-07-06 23:36:34.000000000 +0200 ++++ mysql-8.0.30/sql/CMakeLists.txt 2022-10-09 08:53:20.935355008 +0200 +@@ -755,7 +755,6 @@ SET(SQL_SOURCE + ${CONF_SOURCES} + ${SQL_SHARED_SOURCES} + ${SQL_HEADERS} +- ${BUNDLED_LZ4_PATH}/xxhash.c + ../libmysql/errmsg.cc + ../sql-common/client.cc + ../sql-common/client_plugin.cc +@@ -813,11 +812,6 @@ IF(WIN32) + ) + ENDIF() + +-MY_ADD_COMPILE_DEFINITIONS( +- ${BUNDLED_LZ4_PATH}/xxhash.c +- COMPILE_DEFINITIONS XXH_NAMESPACE=MY_ +- ) +- + # Workaround for Apple Clang bug on ARM. + # When linking mysqld (and executables using server_unittest_library) + # we get linker warnings about +@@ -842,13 +836,6 @@ IF(APPLE_ARM) + ) + ENDIF() + +-ADD_COMPILE_FLAGS( +- ${BUNDLED_LZ4_PATH}/xxhash.c +- iterators/hash_join_iterator.cc +- rpl_write_set_handler.cc +- COMPILE_FLAGS -I${CMAKE_SOURCE_DIR}/extra/lz4 -I${BUNDLED_LZ4_PATH} +- ) +- + # Fixes "C1128: number of sections exceeded object file format limit" in MSVC + IF(WIN32) + ADD_COMPILE_FLAGS( +@@ -924,7 +911,7 @@ ADD_DEPENDENCIES(sql_main GenBootstrapPr + ADD_DEPENDENCIES(sql_main GenSysSchema) + TARGET_LINK_LIBRARIES(sql_main ${MYSQLD_STATIC_PLUGIN_LIBS} + mysql_server_component_services mysys strings vio +- binlogevents_static ${LIBWRAP} ${LIBDL} ${SSL_LIBRARIES}) ++ binlogevents_static xxhash ${LIBWRAP} ${LIBDL} ${SSL_LIBRARIES}) + + # sql/immutable_string.h uses + # google::protobuf::io::CodedOutputStream::WriteVarint64ToArray +--- mysql-8.0.30/sql/iterators/hash_join_iterator.cc.orig 2022-07-06 23:36:34.000000000 +0200 ++++ mysql-8.0.30/sql/iterators/hash_join_iterator.cc 2022-10-09 17:45:57.618897459 +0200 +@@ -32,7 +32,7 @@ + #include "field_types.h" + #include "my_alloc.h" + #include "my_bit.h" +-#include "my_xxhash.h" ++#include + + #include "my_inttypes.h" + #include "my_sys.h" +@@ -307,7 +307,7 @@ static bool WriteRowToChunk( + const uint64_t join_key_hash = + join_key_and_row_buffer->length() == 0 + ? kZeroKeyLengthHash +- : MY_XXH64(join_key_and_row_buffer->ptr(), ++ : XXH64(join_key_and_row_buffer->ptr(), + join_key_and_row_buffer->length(), xxhash_seed); + + assert((chunks->size() & (chunks->size() - 1)) == 0); +--- mysql-8.0.30/sql/rpl_write_set_handler.cc.orig 2022-07-06 23:36:34.000000000 +0200 ++++ mysql-8.0.30/sql/rpl_write_set_handler.cc 2022-10-09 20:07:41.099496817 +0200 +@@ -37,7 +37,7 @@ + #include "my_dbug.h" + #include "my_inttypes.h" + #include "my_murmur3.h" // murmur3_32 +-#include "my_xxhash.h" // IWYU pragma: keep ++#include + #include "mysql_com.h" + #include "sql-common/json_binary.h" + #include "sql-common/json_dom.h" +@@ -75,7 +75,7 @@ uint64 calc_hash(ulong algorithm, type T + if (algorithm == HASH_ALGORITHM_MURMUR32) + return (murmur3_32((const uchar *)T, len, 0)); + else +- return (MY_XXH64((const uchar *)T, len, 0)); ++ return (XXH64((const uchar *)T, len, 0)); + } + + #ifndef NDEBUG +--- mysql-8.0.30/unittest/gunit/hash_join-t.cc.orig 2022-07-06 23:36:34.000000000 +0200 ++++ mysql-8.0.30/unittest/gunit/hash_join-t.cc 2022-10-09 20:36:43.693389709 +0200 +@@ -28,7 +28,7 @@ + + #include "include/my_murmur3.h" + #include "my_alloc.h" +-#include "my_xxhash.h" ++#include + #include "sql/item_cmpfunc.h" + #include "sql/iterators/hash_join_buffer.h" + #include "sql/iterators/hash_join_iterator.h" +@@ -204,7 +204,7 @@ static void BM_XXHash64ShortData(size_t + + size_t sum = 0; + for (size_t i = 0; i < num_iterations; ++i) { +- sum += MY_XXH64(&data[0], data.size(), 0); ++ sum += XXH64(&data[0], data.size(), 0); + } + StopBenchmarkTiming(); + +@@ -223,7 +223,7 @@ static void BM_XXHash64LongData(size_t n + + size_t sum = 0; + for (size_t i = 0; i < num_iterations; ++i) { +- sum += MY_XXH64(&data[0], data.size(), 0); ++ sum += XXH64(&data[0], data.size(), 0); + } + StopBenchmarkTiming(); + +--- mysql-8.0.30/unittest/gunit/innodb/ut0rnd-t.cc.orig 2022-07-06 23:36:34.000000000 +0200 ++++ mysql-8.0.30/unittest/gunit/innodb/ut0rnd-t.cc 2022-10-09 20:46:00.157041753 +0200 +@@ -33,7 +33,7 @@ + #include "storage/innobase/include/ut0crc32.h" + #include "storage/innobase/include/ut0rnd.h" + +-#include "my_xxhash.h" ++#include + + namespace innodb_ut0rnd_unittest { + diff --git a/mysql.spec b/mysql.spec index fc72271..3f68efa 100644 --- a/mysql.spec +++ b/mysql.spec @@ -1,4 +1,6 @@ # TODO: +# - -DWITH_AUTHENTICATION_KERBEROS=ON (BR: MIT krb5) +# - -DWITH_AUTHENTICATION_FIDO=ON (using system libfido?) # - mysqldump ... (invalid usage) prints to stdout not stderr (idiotic if you want to create dump and get usage in .sql) # - http://bugs.mysql.com/bug.php?id=16470 # - innodb are dynamic (= as plugins) ? @@ -19,11 +21,11 @@ %bcond_without systemtap # systemtap/dtrace probes %bcond_without tcpd # libwrap (tcp_wrappers) support %bcond_with sphinx # Sphinx storage engine support -# mysql needs boost 1.73.0 and doesn't support newer/older boost versions +# mysql needs boost 1.77.0 and doesn't support newer/older boost versions %bcond_with system_boost %bcond_without tests # run test suite %bcond_with ndb # NDB is now a separate product, this here is broken, so disable it -%bcond_without ldap # LDAP auth support +%bcond_without ldap # LDAP auth support (requires MIT Kerberos) Summary: MySQL: a very fast and reliable SQL database engine Summary(de.UTF-8): MySQL: ist eine SQL-Datenbank @@ -34,18 +36,18 @@ Summary(ru.UTF-8): MySQL - быстрый SQL-сервер Summary(uk.UTF-8): MySQL - швидкий SQL-сервер Summary(zh_CN.UTF-8): MySQL数据库服务器 Name: mysql -Version: 8.0.25 +Version: 8.0.30 Release: 0.1 License: GPL v2 + MySQL FOSS License Exception Group: Applications/Databases #Source0Download: https://dev.mysql.com/downloads/mysql/8.0.html#downloads Source0: http://cdn.mysql.com/Downloads/MySQL-8.0/%{name}-%{version}.tar.gz -# Source0-md5: 001a17602310317d17524b2e36113c53 +# Source0-md5: cb88420e449603b82ba8ed84302922e1 Source100: http://www.sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz # Source100-md5: 5cac34f3d78a9d612ca4301abfcbd666 %if %{without system_boost} -Source101: http://downloads.sourceforge.net/boost/boost_1_73_0.tar.bz2 -# Source101-md5: 9273c8c4576423562bbe84574b07b2bd +Source101: http://downloads.sourceforge.net/boost/boost_1_77_0.tar.bz2 +# Source101-md5: 09dc857466718f27237144c6f2432d86 %endif Source1: %{name}.init Source2: %{name}.sysconfig @@ -61,10 +63,10 @@ Source12: %{name}-ndb-cpc.sysconfig Source13: %{name}-client.conf Source14: my.cnf Patch0: %{name}-opt.patch +Patch1: %{name}-system-xxhash.patch Patch17: %{name}-5.7-sphinx.patch Patch18: %{name}-sphinx.patch -Patch19: %{name}-chain-certs.patch Patch24: %{name}-cmake.patch Patch25: %{name}-readline.patch @@ -72,17 +74,21 @@ Patch25: %{name}-readline.patch Patch26: %{name}dumpslow-clusters.patch URL: http://www.mysql.com/products/community/ BuildRequires: bison >= 1.875 -%{?with_system_boost:BuildRequires: boost-devel >= 1.72.0} +%{?with_system_boost:BuildRequires: boost-devel >= 1.77.0} BuildRequires: cmake >= 2.8.2 +%{?with_ldap:BuildRequires: cyrus-sasl-devel} +# for configure and tests +%{?with_ldap:BuildRequires: cyrus-sasl-scram} +#%{?with_ldap:BuildRequires: krb5-devel} BuildRequires: libaio-devel BuildRequires: libevent-devel BuildRequires: libhsclient-devel -BuildRequires: libstdc++-devel >= 5:4.0 +BuildRequires: libstdc++-devel >= 5:7.1 %{?with_tcpd:BuildRequires: libwrap-devel} BuildRequires: lz4-devel BuildRequires: mecab-devel BuildRequires: ncurses-devel >= 4.2 -%{?with_ssl:BuildRequires: openssl-devel >= 0.9.7d} +%{?with_ssl:BuildRequires: openssl-devel >= 1.1.1} %{?with_ldap:BuildRequires: openldap-devel} BuildRequires: pam-devel BuildRequires: perl-devel >= 1:5.6.1 @@ -95,7 +101,9 @@ BuildRequires: rpm-perlprov >= 4.1-13 BuildRequires: rpmbuild(macros) >= 1.605 BuildRequires: sed >= 4.0 %{?with_systemtap:BuildRequires: systemtap-sdt-devel} -BuildRequires: zlib-devel +BuildRequires: xxHash-devel +BuildRequires: zlib-devel >= 1.2.12 +BuildRequires: zstd-devel Requires(post): sed >= 4.0 Requires(post,preun): /sbin/chkconfig Requires(postun): /usr/sbin/groupdel @@ -301,6 +309,7 @@ Este pacote contém os clientes padrão para o MySQL. Summary: Shared libraries for MySQL Summary(pl.UTF-8): Biblioteki współdzielone MySQL Group: Libraries +Requires: zlib >= 1.2.12 Obsoletes: libmysql10 < 4 Obsoletes: mysql-doc < 4.1.12 @@ -318,8 +327,8 @@ Summary(ru.UTF-8): MySQL - хедеры и библиотеки разработ Summary(uk.UTF-8): MySQL - хедери та бібліотеки програміста Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} -%{?with_ssl:Requires: openssl-devel} -Requires: zlib-devel +%{?with_ssl:Requires: openssl-devel >= 1.1.1} +Requires: zlib-devel >= 1.2.12 Obsoletes: MySQL-devel < 3.22.27 Obsoletes: libmysql10-devel < 4 Obsoletes: webscalesql-devel @@ -464,6 +473,7 @@ Ten pakiet zawiera standardowego demona MySQL NDB CPC. %setup -q %{?with_sphinx:-a100} %{!?with_system_boost:-a101} #%patch0 -p1 +%patch1 -p1 %if %{with sphinx} # http://www.sphinxsearch.com/docs/manual-0.9.9.html#sphinxse-mysql51 @@ -472,9 +482,6 @@ Ten pakiet zawiera standardowego demona MySQL NDB CPC. %patch18 -p1 %endif -# really not fixed? verify -%patch19 -p1 - %patch24 -p1 %patch25 -p1 @@ -514,12 +521,16 @@ CPPFLAGS="%{rpmcppflags}" \ -DMYSQL_UNIX_ADDR=/var/lib/%{name}/%{name}.sock \ %{?debug:-DWITH_DEBUG=ON} \ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ + %{!?with_ldap:-DWITH_AUTHENTICATION_LDAP=OFF} \ -DWITH_LIBWRAP=%{?with_tcpd:ON}%{!?with_tcpd:OFF} \ -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 \ -DWITH_PIC=ON \ - -DWITH_LZ4=system \ + %{?with_ldap:-DWITH_LDAP=system} \ + -DWITH_KERBEROS=system \ -DWITH_LIBEVENT=system \ + -DWITH_LZ4=system \ -DWITH_PROTOBUF=system \ + -DWITH_SASL=system \ -DWITH_SSL=%{?with_ssl:system}%{!?with_ssl:no} \ -DWITH_UNIT_TESTS=%{?with_tests:ON}%{!?with_tests:OFF} \ %{!?with_system_boost:-DWITH_BOOST="$(pwd)/$(ls -1d ../boost_*)"} \ @@ -862,10 +873,17 @@ done %files %defattr(644,root,root,755) -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name} +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/mysql +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/mysqlrouter %attr(754,root,root) /etc/rc.d/init.d/%{name} %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name} %attr(640,root,mysql) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/clusters.conf +%attr(755,root,root) %{_bindir}/ibd2sdi +%attr(755,root,root) %{_bindir}/mysql_migrate_keyring +%attr(755,root,root) %{_bindir}/mysqlrouter +%attr(755,root,root) %{_bindir}/mysqlrouter_keyring +%attr(755,root,root) %{_bindir}/mysqlrouter_passwd +%attr(755,root,root) %{_bindir}/mysqlrouter_plugin_info %attr(755,root,root) %{_sbindir}/innochecksum %attr(755,root,root) %{_sbindir}/my_print_defaults %attr(755,root,root) %{_sbindir}/myisamchk @@ -881,14 +899,33 @@ done %attr(755,root,root) %{_libdir}/%{name}/plugin/auth.so %attr(755,root,root) %{_libdir}/%{name}/plugin/auth_socket.so %attr(755,root,root) %{_libdir}/%{name}/plugin/auth_test_plugin.so +#%attr(755,root,root) %{_libdir}/%{name}/plugin/authentication_fido_client.so %{?with_ldap:%attr(755,root,root) %{_libdir}/%{name}/plugin/authentication_ldap_sasl_client.so} +%attr(755,root,root) %{_libdir}/%{name}/plugin/authentication_oci_client.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_audit_api_message_emit.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_keyring_file.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_log_filter_dragnet.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_log_sink_json.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_log_sink_syseventlog.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_mysqlbackup.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_mysqlx_global_reset.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_pfs_example.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_pfs_example_component_population.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_query_attributes.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_reference_cache.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_udf_*_func.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_validate_password.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/conflicting_variables.so %attr(755,root,root) %{_libdir}/%{name}/plugin/connection_control.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/ddl_rewriter.so %attr(755,root,root) %{_libdir}/%{name}/plugin/group_replication.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/ha_mock.so %attr(755,root,root) %{_libdir}/%{name}/plugin/keyring_file.so %attr(755,root,root) %{_libdir}/%{name}/plugin/keyring_udf.so %attr(755,root,root) %{_libdir}/%{name}/plugin/libpluginmecab.so %attr(755,root,root) %{_libdir}/%{name}/plugin/locking_service.so %attr(755,root,root) %{_libdir}/%{name}/plugin/mypluglib.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/mysql_clone.so %attr(755,root,root) %{_libdir}/%{name}/plugin/mysql_no_login.so %attr(755,root,root) %{_libdir}/%{name}/plugin/qa_auth_client.so %attr(755,root,root) %{_libdir}/%{name}/plugin/qa_auth_interface.so @@ -896,12 +933,36 @@ done %attr(755,root,root) %{_libdir}/%{name}/plugin/replication_observers_example_plugin.so %attr(755,root,root) %{_libdir}/%{name}/plugin/rewriter.so %attr(755,root,root) %{_libdir}/%{name}/plugin/semisync_master.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/semisync_replica.so %attr(755,root,root) %{_libdir}/%{name}/plugin/semisync_slave.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/semisync_source.so %attr(755,root,root) %{_libdir}/%{name}/plugin/validate_password.so %attr(755,root,root) %{_libdir}/%{name}/plugin/version_token.so %if %{with sphinx} %attr(755,root,root) %{_libdir}/%{name}/plugin/ha_sphinx.so %endif +%dir %{_libdir}/%{name}/private +%{_libdir}/%{name}/private/icudt69l +%dir %{_libdir}/mysqlrouter +%attr(755,root,root) %{_libdir}/mysqlrouter/connection_pool.so +%attr(755,root,root) %{_libdir}/mysqlrouter/http_auth_backend.so +%attr(755,root,root) %{_libdir}/mysqlrouter/http_auth_realm.so +%attr(755,root,root) %{_libdir}/mysqlrouter/http_server.so +%attr(755,root,root) %{_libdir}/mysqlrouter/io.so +%attr(755,root,root) %{_libdir}/mysqlrouter/keepalive.so +%attr(755,root,root) %{_libdir}/mysqlrouter/metadata_cache.so +%attr(755,root,root) %{_libdir}/mysqlrouter/rest_api.so +%attr(755,root,root) %{_libdir}/mysqlrouter/rest_connection_pool.so +%attr(755,root,root) %{_libdir}/mysqlrouter/rest_metadata_cache.so +%attr(755,root,root) %{_libdir}/mysqlrouter/rest_router.so +%attr(755,root,root) %{_libdir}/mysqlrouter/rest_routing.so +%attr(755,root,root) %{_libdir}/mysqlrouter/router_openssl.so +%attr(755,root,root) %{_libdir}/mysqlrouter/router_protobuf.so +%attr(755,root,root) %{_libdir}/mysqlrouter/routing.so +%dir %{_libdir}/mysqlrouter/private +%attr(755,root,root) %{_libdir}/mysqlrouter/private/libmysqlharness*.so* +%attr(755,root,root) %{_libdir}/mysqlrouter/private/libmysqlrouter*.so* +%{_mandir}/man1/ibd2sdi.1* %{_mandir}/man1/innochecksum.1* %{_mandir}/man1/my_print_defaults.1* %{_mandir}/man1/myisamchk.1* @@ -909,6 +970,9 @@ done %{_mandir}/man1/myisampack.1* %{_mandir}/man1/mysql_upgrade.1* %{_mandir}/man1/mysqlcheck.1* +%{_mandir}/man1/mysqlrouter.1* +%{_mandir}/man1/mysqlrouter_passwd.1* +%{_mandir}/man1/mysqlrouter_plugin_info.1* %{_mandir}/man8/mysqld.8* %if %{?debug:1}0 @@ -931,7 +995,8 @@ done %{_datadir}/%{name}/english %{_datadir}/%{name}/dictionary.txt -%{_datadir}/%{name}/innodb_memcached_config.sql +%{_datadir}/%{name}/messages_to_clients.txt +%{_datadir}/%{name}/messages_to_error_log.txt %{_datadir}/%{name}/install_rewriter.sql %{_datadir}/%{name}/uninstall_rewriter.sql # Don't mark these with %%lang. These are used depending @@ -968,8 +1033,8 @@ done %files extras %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/myisam_ftdump -%attr(755,root,root) %{_bindir}/mysql_ssl_rsa_setup %attr(755,root,root) %{_bindir}/mysql_secure_installation +%attr(755,root,root) %{_bindir}/mysql_ssl_rsa_setup %attr(755,root,root) %{_bindir}/mysql_tzinfo_to_sql %attr(755,root,root) %{_bindir}/perror %{_mandir}/man1/myisam_ftdump.1* @@ -1035,14 +1100,55 @@ done %{_libdir}/libndbclient.a %endif +# rename to test or split? %files bench %defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/comp_err +%attr(755,root,root) %{_bindir}/mysql_keyring_encryption_test %attr(755,root,root) %{_bindir}/mysqlslap %attr(755,root,root) %{_bindir}/mysqltest +%attr(755,root,root) %{_bindir}/mysqltest_safe_process +%attr(755,root,root) %{_bindir}/zlib_decompress +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_example_component1.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_example_component2.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_example_component3.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_log_sink_test.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_audit_api_message.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_backup_lock_service.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_component_deinit.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_host_application_signal.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_mysql_current_thread_reader.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_mysql_runtime_error.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_mysql_system_variable_set.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_pfs_notification.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_pfs_resource_group.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_sensitive_system_variables.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_status_var_service.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_status_var_service_int.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_status_var_service_reg_only.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_status_var_service_str.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_status_var_service_unreg_only.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_string_service.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_string_service_charset.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_string_service_long.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_sys_var_service.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_sys_var_service_int.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_sys_var_service_same.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_sys_var_service_str.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_system_variable_source.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_table_access.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_udf_registration.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_udf_services.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/pfs_example_plugin_employee.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/test_services_host_application_signal.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/test_services_plugin_registry.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/udf_example.so #%dir %{_datadir}/sql-bench #%{_datadir}/sql-bench/[CDRl]* #%attr(755,root,root) %{_datadir}/sql-bench/[bcgirst]* +%{_mandir}/man1/lz4_decompress.1* %{_mandir}/man1/mysqlslap.1* +%{_mandir}/man1/zlib_decompress.1* #%files doc #%defattr(644,root,root,755) -- 2.44.0