[packages/mysql] Up to 9.7.0
arekm
arekm at pld-linux.org
Wed May 20 15:17:27 CEST 2026
commit 5e0763c0ac5b00d6b8aea9152b1b723ddd408af3
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed May 20 15:17:01 2026 +0200
Up to 9.7.0
mysql-5.7-sphinx.patch | 234 --------------------------------------
mysql-ndb-cpc.init | 92 ---------------
mysql-ndb-cpc.sysconfig | 2 -
mysql-ndb-mgm.init | 92 ---------------
mysql-ndb-mgm.sysconfig | 2 -
mysql-ndb.init | 92 ---------------
mysql-ndb.sysconfig | 2 -
mysql-opt.patch | 57 ----------
mysql-readline.patch | 31 +----
mysql-sphinx.patch | 33 ------
mysql-system-xxhash.patch | 168 ---------------------------
mysql.spec | 265 +++++++------------------------------------
mysqldumpslow-clusters.patch | 46 --------
13 files changed, 43 insertions(+), 1073 deletions(-)
---
diff --git a/mysql.spec b/mysql.spec
index 78a0140..e88a20a 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -13,18 +13,10 @@
# (profiling disabled temporaily to workaround this)
#
# Conditional build:
-%bcond_without innodb # InnoDB storage engine support
-%bcond_without big_tables # Support tables with more than 4G rows even on 32 bit platforms
-%bcond_without federated # Federated storage engine support
-%bcond_without raid # RAID support
%bcond_without ssl # OpenSSL support
%bcond_without systemtap # systemtap/dtrace probes
%bcond_without tcpd # libwrap (tcp_wrappers) support
-%bcond_with sphinx # Sphinx storage engine support
-# mysql needs boost 1.77.0 and doesn't support newer/older boost versions
-%bcond_with system_boost
%bcond_with tests # run test suite (doesn't run cleanly for ages)
-%bcond_with ndb # NDB is now a separate product, this here is broken, so disable it
%bcond_with ldap # LDAP (server) auth support (requires MIT Kerberos)
Summary: MySQL: a very fast and reliable SQL database engine
@@ -35,53 +27,33 @@ Summary(pt_BR.UTF-8): MySQL: Um servidor SQL rápido e confiável
Summary(ru.UTF-8): MySQL - быстрый SQL-сервер
Summary(uk.UTF-8): MySQL - швидкий SQL-сервер
Summary(zh_CN.UTF-8): MySQL数据库服务器
-%define majorver 8.4
+%define majorver 9.7
Name: mysql%{majorver}
# keep stable (and not "innovation") line here
-Version: 8.4.9
+Version: 9.7.0
Release: 1
License: GPL v2 + MySQL FOSS License Exception
Group: Applications/Databases
-#Source0Download: https://dev.mysql.com/downloads/mysql/8.4.html#downloads
+#Source0Download: https://dev.mysql.com/downloads/mysql/%{majorver}.html#downloads
Source0: http://cdn.mysql.com/Downloads/MySQL-%{majorver}/mysql-%{version}.tar.gz
-# Source0-md5: 7b2591fa0b5388f604cc9b8273eab331
-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_84_0.tar.bz2
-# Source101-md5: 9dcd632441e4da04a461082ebbafd337
-%endif
+# Source0-md5: 09137b601658906da52585f411a37fa7
Source1: mysql.init
Source2: mysql.sysconfig
Source3: mysql.logrotate
Source4: mysqld.conf
Source5: mysql-clusters.conf
-Source7: mysql-ndb.init
-Source8: mysql-ndb.sysconfig
-Source9: mysql-ndb-mgm.init
-Source10: mysql-ndb-mgm.sysconfig
-Source11: mysql-ndb-cpc.init
-Source12: mysql-ndb-cpc.sysconfig
Source13: mysql-client.conf
Source14: my.cnf
-Patch0: mysql-opt.patch
-Patch1: mysql-system-xxhash.patch
-
-Patch17: mysql-5.7-sphinx.patch
-Patch18: mysql-sphinx.patch
-
Patch24: mysql-cmake.patch
Patch25: mysql-readline.patch
-
-Patch26: mysqldumpslow-clusters.patch
URL: https://www.mysql.com/products/community/
BuildRequires: bison >= 1.875
-%{?with_system_boost:BuildRequires: boost-devel >= 1.77.0}
BuildRequires: cmake >= 3.14.6
BuildRequires: cyrus-sasl-devel
# for configure and tests
BuildRequires: cyrus-sasl-scram
#%{?with_ldap:BuildRequires: krb5-devel}
+BuildRequires: curl-devel
BuildRequires: libaio-devel
BuildRequires: libfido2-devel
BuildRequires: libicu-devel
@@ -427,74 +399,12 @@ This package contains manual in HTML format.
%description doc -l pl.UTF-8
Podręcznik MySQL-a w formacie HTML.
-%package ndb
-Summary: MySQL - NDB Storage Engine Daemon
-Summary(pl.UTF-8): MySQL - demon silnika przechowywania danych NDB
-Group: Applications/Databases
-Requires: %{name}-libs = %{version}-%{release}
-
-%description ndb
-This package contains the standard MySQL NDB Storage Engine Daemon.
-
-%description ndb -l pl.UTF-8
-Ten pakiet zawiera standardowego demona silnika przechowywania danych
-NDB.
-
-%package ndb-client
-Summary: MySQL - NDB Clients
-Summary(pl.UTF-8): MySQL - programy klienckie NDB
-Group: Applications/Databases
-Requires: %{name}-libs = %{version}-%{release}
-
-%description ndb-client
-This package contains the standard MySQL NDB Clients.
-
-%description ndb-client -l pl.UTF-8
-Ten pakiet zawiera standardowe programy klienckie MySQL NDB.
-
-%package ndb-mgm
-Summary: MySQL - NDB Management Daemon
-Summary(pl.UTF-8): MySQL - demon zarządzający NDB
-Group: Applications/Databases
-Requires: %{name}-libs = %{version}-%{release}
-
-%description ndb-mgm
-This package contains the standard MySQL NDB Management Daemon.
-
-%description ndb-mgm -l pl.UTF-8
-Ten pakiet zawiera standardowego demona zarządzającego MySQL NDB.
-
-%package ndb-cpc
-Summary: MySQL - NDB CPC Daemon
-Summary(pl.UTF-8): MySQL - demon NDB CPC
-Group: Applications/Databases
-Requires: %{name}-libs = %{version}-%{release}
-
-%description ndb-cpc
-This package contains the standard MySQL NDB CPC Daemon.
-
-%description ndb-cpc -l pl.UTF-8
-Ten pakiet zawiera standardowego demona MySQL NDB CPC.
-
%prep
-%setup -q %{?with_sphinx:-a100} %{!?with_system_boost:-a101} -n mysql-%{version}
-
-#%%patch0 -p1
-# FIXME
-#%%patch1 -p1
-
-%if %{with sphinx}
-# http://www.sphinxsearch.com/docs/manual-0.9.9.html#sphinxse-mysql51
-%{__mv} sphinx-*/mysqlse storage/sphinx
-%patch -P17 -p1
-%patch -P18 -p1
-%endif
+%setup -q -n mysql-%{version}
%patch -P24 -p1
%patch -P25 -p1
-#%%patch26 -p1
-
# to get these files rebuild
[ -f sql/sql_yacc.cc ] && %{__rm} sql/sql_yacc.cc
[ -f sql/sql_yacc.h ] && %{__rm} sql/sql_yacc.h
@@ -536,7 +446,8 @@ CPPFLAGS="%{rpmcppflags}" \
-DROUTER_INSTALL_PLUGINDIR=%{_libdir}/%{name}router \
-DWITH_AUTHENTICATION_CLIENT_PLUGINS=ON \
%{?with_ldap:-DWITH_AUTHENTICATION_LDAP=ON} \
- %{!?with_system_boost:-DWITH_BOOST="$(readlink -f boost_*)"} \
+ -DWITH_AUTHENTICATION_WEBAUTHN=ON \
+ -DWITH_CURL=system \
%{?debug:-DWITH_DEBUG=ON} \
-DWITH_EDITLINE=system \
-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
@@ -580,32 +491,12 @@ sed -e 's#{MYSQL_MAJOR}#%{majorver}#g' %{SOURCE4} > mysqld.conf
sed -e 's#{MYSQL_MAJOR}#%{majorver}#g' %{SOURCE5} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/clusters.conf
touch $RPM_BUILD_ROOT/var/log/%{name}/{mysqld,query,slow}.log
-%{__mv} $RPM_BUILD_ROOT/etc/logrotate.d/{mysqlrouter,%{name}router}
-
-# remove innodb directives from mysqld.conf if mysqld is configured without
-%if %{without innodb}
- cp mysqld.conf mysqld.tmp
- awk 'BEGIN { RS="\n\n" } !/innodb/ { printf("%s\n\n", $0) }' < mysqld.tmp > mysqld.conf
-%endif
-
-# remove berkeley-db directives from mysqld.conf if mysqld is configured without
-cp mysqld.conf mysqld.tmp
-awk 'BEGIN { RS="\n\n" } !/bdb/ { printf("%s\n\n", $0) }' < mysqld.tmp > mysqld.conf
+%{__rm} $RPM_BUILD_ROOT/etc/logrotate.d/mysqlrouter
cp -a mysqld.conf $RPM_BUILD_ROOT%{_datadir}/%{name}/mysqld.conf
cp -a %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/mysql-client.conf
ln -s mysql-client.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/my.cnf
-cp -a %{SOURCE14} $RPM_BUILD_ROOT/etc/skel/.my.cnf
-
-# NDB
-%if %{with ndb}
-install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-ndb
-cp -a %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/%{name}-ndb
-install -p %{SOURCE9} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-ndb-mgm
-cp -a %{SOURCE10} $RPM_BUILD_ROOT/etc/sysconfig/%{name}-ndb-mgm
-install -p %{SOURCE11} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-ndb-cpc
-cp -a %{SOURCE12} $RPM_BUILD_ROOT/etc/sysconfig/%{name}-ndb-cpc
-%endif
+cp -a %{SOURCE14} $RPM_BUILD_ROOT/etc/skel/.my.cnf-%{majorver}
sed -i -e 's,/usr//usr,%{_prefix},g' $RPM_BUILD_ROOT%{_bindir}/mysql_config
sed -i -e '/libs/s/$ldflags//' $RPM_BUILD_ROOT%{_bindir}/mysql_config
@@ -654,6 +545,9 @@ sed -i -e '/libs/s/-lprobes_mysql//' $RPM_BUILD_ROOT%{_bindir}/mysql_config
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/plugin/rewrite_example.so
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/plugin/test_security_context.so
+# empty debug-plugin dir is only populated when building with sanitizers
+rmdir $RPM_BUILD_ROOT%{_libdir}/%{name}/plugin/debug
+
# fix names for parallel coinstallation
for f in $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/* ; do
fb=$(basename "$f")
@@ -694,36 +588,6 @@ if [ "$1" = "0" ]; then
%groupremove mysql
fi
-%post ndb
-/sbin/chkconfig --add %{name}-ndb
-%service %{name}-ndb restart "%{name} NDB engine"
-
-%preun ndb
-if [ "$1" = "0" ]; then
- %service %{name}-ndb stop
- /sbin/chkconfig --del %{name}-ndb
-fi
-
-%post ndb-mgm
-/sbin/chkconfig --add %{name}-ndb-mgm
-%service %{name}-ndb-mgm restart "%{name} NDB management node"
-
-%preun ndb-mgm
-if [ "$1" = "0" ]; then
- %service %{name}-ndb-mgm stop
- /sbin/chkconfig --del %{name}-ndb-mgm
-fi
-
-%post ndb-cpc
-/sbin/chkconfig --add %{name}-ndb-cpc
-%service %{name}-ndb-cpc restart "%{name} NDB CPC"
-
-%preun ndb-cpc
-if [ "$1" = "0" ]; then
- %service %{name}-ndb-cpc stop
- /sbin/chkconfig --del %{name}-ndb-cpc
-fi
-
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
@@ -738,7 +602,9 @@ fi
%attr(755,root,root) %{_bindir}/ibd2sdi%{majorver}
%attr(755,root,root) %{_bindir}/mysql_migrate_keyring%{majorver}
%attr(755,root,root) %{_bindir}/mysqlrouter%{majorver}
+%attr(755,root,root) %{_bindir}/mysqlrouter_bootstrap%{majorver}
%attr(755,root,root) %{_bindir}/mysqlrouter_keyring%{majorver}
+%attr(755,root,root) %{_bindir}/mysqlrouter_mrs_client%{majorver}
%attr(755,root,root) %{_bindir}/mysqlrouter_passwd%{majorver}
%attr(755,root,root) %{_bindir}/mysqlrouter_plugin_info%{majorver}
%attr(755,root,root) %{_sbindir}/innochecksum%{majorver}
@@ -757,8 +623,14 @@ fi
%attr(755,root,root) %{_libdir}/%{name}/plugin/auth_test_plugin.so
%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/authentication_openid_connect_client.so
%attr(755,root,root) %{_libdir}/%{name}/plugin/authentication_webauthn_client.so
%attr(755,root,root) %{_libdir}/%{name}/plugin/component_audit_api_message_emit.so
+%attr(755,root,root) %{_libdir}/%{name}/plugin/component_classic_hashing.so
+%attr(755,root,root) %{_libdir}/%{name}/plugin/component_connection_control.so
+%attr(755,root,root) %{_libdir}/%{name}/plugin/component_group_replication_elect_prefers_most_updated.so
+%attr(755,root,root) %{_libdir}/%{name}/plugin/component_group_replication_flow_control_stats.so
+%attr(755,root,root) %{_libdir}/%{name}/plugin/component_group_replication_resource_manager.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
@@ -769,6 +641,8 @@ fi
%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_replication_applier_metrics.so
+%attr(755,root,root) %{_libdir}/%{name}/plugin/component_telemetry.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
@@ -781,32 +655,31 @@ fi
%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_native_password.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
%attr(755,root,root) %{_libdir}/%{name}/plugin/qa_auth_server.so
%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/telemetry_client.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}router
%attr(755,root,root) %{_libdir}/%{name}router/connection_pool.so
%attr(755,root,root) %{_libdir}/%{name}router/destination_status.so
+%attr(755,root,root) %{_libdir}/%{name}router/host_cache.so
%attr(755,root,root) %{_libdir}/%{name}router/http_auth_backend.so
%attr(755,root,root) %{_libdir}/%{name}router/http_auth_realm.so
%attr(755,root,root) %{_libdir}/%{name}router/http_server.so
%attr(755,root,root) %{_libdir}/%{name}router/io.so
%attr(755,root,root) %{_libdir}/%{name}router/keepalive.so
%attr(755,root,root) %{_libdir}/%{name}router/metadata_cache.so
+%attr(755,root,root) %{_libdir}/%{name}router/mysql_rest_service.so
%attr(755,root,root) %{_libdir}/%{name}router/rest_api.so
%attr(755,root,root) %{_libdir}/%{name}router/rest_connection_pool.so
+%attr(755,root,root) %{_libdir}/%{name}router/rest_host_cache.so
%attr(755,root,root) %{_libdir}/%{name}router/rest_metadata_cache.so
%attr(755,root,root) %{_libdir}/%{name}router/rest_router.so
%attr(755,root,root) %{_libdir}/%{name}router/rest_routing.so
@@ -900,7 +773,7 @@ fi
%files client
%defattr(644,root,root,755)
-#%attr(600,root,root) %config(noreplace,missingok) %verify(not md5 mtime size) /etc/skel/.my.cnf
+%attr(600,root,root) %config(noreplace,missingok) %verify(not md5 mtime size) /etc/skel/.my.cnf-%{majorver}
%attr(755,root,root) %{_bindir}/mysql%{majorver}
%attr(755,root,root) %{_bindir}/mysqladmin%{majorver}
%attr(755,root,root) %{_bindir}/mysqlbinlog%{majorver}
@@ -923,19 +796,12 @@ fi
%{_sysconfdir}/%{name}/my.cnf
%attr(755,root,root) %{_libdir}/libmysqlclient.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libmysqlclient.so.24
-%if %{with ndb}
-%attr(755,root,root) %{_libdir}/libndbclient.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libndbclient.so.3
-%endif
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/mysql_config
%attr(755,root,root) %{_bindir}/mysql_config%{majorver}
%attr(755,root,root) %{_libdir}/libmysqlclient.so
-%if %{with ndb}
-%attr(755,root,root) %{_libdir}/libndbclient.so
-%endif
%{_pkgconfigdir}/mysqlclient.pc
%{_libdir}/libmysqlservices.a
%{_includedir}/mysql
@@ -945,9 +811,6 @@ fi
%files static
%defattr(644,root,root,755)
%{_libdir}/libmysqlclient.a
-%if %{with ndb}
-%{_libdir}/libndbclient.a
-%endif
# rename to test or split?
%files bench
@@ -965,6 +828,9 @@ fi
%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_component_deinit_no_deadlock.so
+%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_component_init_fail.so
+%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_component_init_then_register.so
%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_event_tracking_consumer.so
%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_event_tracking_consumer_a.so
%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_event_tracking_consumer_b.so
@@ -976,6 +842,7 @@ fi
%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_host_application_signal.so
%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_mysql_command_services.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_file_service.so
%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_mysql_runtime_error.so
%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_mysql_signal_handler.so
%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_mysql_system_variable_set.so
@@ -983,8 +850,11 @@ fi
%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_server_telemetry_logs_client.so
+%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_server_telemetry_logs_export.so
%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_server_telemetry_metrics.so
%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_server_telemetry_traces.so
+%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_session_var_service.so
%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_status_var_reader.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
@@ -1000,6 +870,9 @@ fi
%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_telemetry_resource_provider.so
+%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_telemetry_secret_provider.so
+%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_udf_aggregate.so
%attr(755,root,root) %{_libdir}/%{name}/plugin/component_test_udf_registration.so
%attr(755,root,root) %{_libdir}/%{name}/plugin/pfs_example_plugin_employee.so
%attr(755,root,root) %{_libdir}/%{name}/plugin/test_services_command_services.so
@@ -1011,63 +884,3 @@ fi
#%files doc
#%defattr(644,root,root,755)
#%doc Docs/manual.html Docs/manual_toc.html
-
-%if %{with ndb}
-%files ndb
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/ndbd%{majorver}
-%attr(754,root,root) /etc/rc.d/init.d/%{name}-ndb
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/mysql-ndb
-%{_mandir}/man1/ndbd_redo_log_reader%{majorver}.1*
-%{_mandir}/man8/ndbd%{majorver}.8*
-
-%files ndb-client
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/ndb_config%{majorver}
-%attr(755,root,root) %{_bindir}/ndb_delete_all%{majorver}
-%attr(755,root,root) %{_bindir}/ndb_desc%{majorver}
-%attr(755,root,root) %{_bindir}/ndb_drop_index%{majorver}
-%attr(755,root,root) %{_bindir}/ndb_drop_table%{majorver}
-%attr(755,root,root) %{_bindir}/ndb_error_reporter%{majorver}
-%attr(755,root,root) %{_bindir}/ndb_mgm%{majorver}
-%attr(755,root,root) %{_bindir}/ndb_print_backup_file%{majorver}
-%attr(755,root,root) %{_bindir}/ndb_print_schema_file%{majorver}
-%attr(755,root,root) %{_bindir}/ndb_print_sys_file%{majorver}
-%attr(755,root,root) %{_bindir}/ndb_restore%{majorver}
-%attr(755,root,root) %{_bindir}/ndb_select_all%{majorver}
-%attr(755,root,root) %{_bindir}/ndb_select_count%{majorver}
-%attr(755,root,root) %{_bindir}/ndb_show_tables%{majorver}
-%attr(755,root,root) %{_bindir}/ndb_size.pl%{majorver}
-%attr(755,root,root) %{_bindir}/ndb_test_platform%{majorver}
-%attr(755,root,root) %{_bindir}/ndb_waiter%{majorver}
-%{_mandir}/man1/ndb_config%{majorver}.1*
-%{_mandir}/man1/ndb_delete_all%{majorver}.1*
-%{_mandir}/man1/ndb_desc%{majorver}.1*
-%{_mandir}/man1/ndb_drop_index%{majorver}.1*
-%{_mandir}/man1/ndb_drop_table%{majorver}.1*
-%{_mandir}/man1/ndb_error_reporter%{majorver}.1*
-%{_mandir}/man1/ndb_mgm%{majorver}.1*
-%{_mandir}/man1/ndb_print_backup_file%{majorver}.1*
-%{_mandir}/man1/ndb_print_schema_file%{majorver}.1*
-%{_mandir}/man1/ndb_print_sys_file%{majorver}.1*
-%{_mandir}/man1/ndb_restore%{majorver}.1*
-%{_mandir}/man1/ndb_select_all%{majorver}.1*
-%{_mandir}/man1/ndb_select_count%{majorver}.1*
-%{_mandir}/man1/ndb_show_tables%{majorver}.1*
-%{_mandir}/man1/ndb_size.pl%{majorver}.1*
-%{_mandir}/man1/ndb_waiter%{majorver}.1*
-
-%files ndb-mgm
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/ndb_mgmd%{majorver}
-%attr(754,root,root) /etc/rc.d/init.d/%{name}-ndb-mgm
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/mysql-ndb-mgm
-%{_mandir}/man8/ndb_mgmd%{majorver}.8*
-
-%files ndb-cpc
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/ndb_cpcd%{majorver}
-%attr(754,root,root) /etc/rc.d/init.d/%{name}-ndb-cpc
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/mysql-ndb-cpc
-%{_mandir}/man1/ndb_cpcd%{majorver}.1*
-%endif
diff --git a/mysql-5.7-sphinx.patch b/mysql-5.7-sphinx.patch
deleted file mode 100644
index a47ed9d..0000000
--- a/mysql-5.7-sphinx.patch
+++ /dev/null
@@ -1,234 +0,0 @@
-From d4273a352d22e8c5e924bc4fd094fc7d9f8e047f Mon Sep 17 00:00:00 2001
-From: riden <denis.doronin at gmail.com>
-Date: Thu, 26 Nov 2015 03:51:40 +0200
-Subject: [PATCH] MySQLSE MySQL 5.7 support
-
----
- mysqlse/ha_sphinx.cc | 66 ++++++++++++++++++++++++++++++++++++++-----------
- mysqlse/snippets_udf.cc | 22 +++++++++++++----
- 2 files changed, 68 insertions(+), 20 deletions(-)
-
-diff --git a/storage/sphinx/ha_sphinx.cc b/storage/sphinx/ha_sphinx.cc
-index 8eabe87..e6a49a8 100644
---- a/storage/sphinx/ha_sphinx.cc
-+++ b/storage/sphinx/ha_sphinx.cc
-@@ -34,13 +34,37 @@
- #include "../mysql_priv.h"
- #endif
-
-+#if MYSQL_VERSION_ID>=50709
-+#include "item_timefunc.h"
-+#define sphinx_append push_back
-+#define sphinx_array std::vector
-+#define sphinx_elements size
-+#if defined(_WIN32)
-+#define __WIN__ _WIN32
-+#define pthread_mutex_init(A,B) (InitializeCriticalSection(A),0)
-+#define pthread_mutex_lock(A) (EnterCriticalSection(A),0)
-+#define pthread_mutex_unlock(A) (LeaveCriticalSection(A), 0)
-+#define pthread_mutex_destroy(A) (DeleteCriticalSection(A), 0)
-+#define in_addr_t uint32
-+#include <winsock2.h>
-+#endif
-+#else
-+#define sphinx_append append
-+#define sphinx_array Dynamic_array
-+#define sphinx_elements elements
-+#endif
-+
- #include <mysys_err.h>
- #include <my_sys.h>
- #include <mysql.h> // include client for INSERT table (sort of redoing federated..)
-
- #ifndef __WIN__
- // UNIX-specific
-- #include <my_net.h>
-+ #if MYSQL_VERSION_ID>=50709
-+ #include <arpa/inet.h>
-+ #else
-+ #include <my_net.h>
-+ #endif
- #include <netdb.h>
- #include <sys/un.h>
-
-@@ -286,6 +310,12 @@ inline void SPH_DEBUG ( const char *, ... ) {}
- #define SafeDelete(_arg) { if ( _arg ) delete ( _arg ); (_arg) = NULL; }
- #define SafeDeleteArray(_arg) { if ( _arg ) delete [] ( _arg ); (_arg) = NULL; }
-
-+#if MYSQL_VERSION_ID>=50709
-+#ifdef __WIN__
-+typedef native_mutex_t pthread_mutex_t;
-+#endif
-+#endif
-+
- //////////////////////////////////////////////////////////////////////////////
-
- /// per-table structure that will be shared among all open Sphinx SE handlers
-@@ -602,10 +632,10 @@ struct CSphSEQuery
- };
- char * m_sName; ///< points to query buffer
- int m_iType;
-- Dynamic_array<ulonglong> m_dIds;
-- Dynamic_array<Value_t> m_dValues;
-+ sphinx_array<ulonglong> m_dIds;
-+ sphinx_array<Value_t> m_dValues;
- };
-- Dynamic_array<Override_t *> m_dOverrides;
-+ sphinx_array<Override_t *> m_dOverrides;
-
- public:
- char m_sParseError[256];
-@@ -733,9 +763,13 @@ static int sphinx_init_func ( void * p )
- {
- sphinx_init = 1;
- void ( pthread_mutex_init ( &sphinx_mutex, MY_MUTEX_INIT_FAST ) );
-+ #if MYSQL_VERSION_ID >= 50709
-+ sphinx_hash_init ( &sphinx_open_tables, system_charset_info, 32, 0, 0,
-+ sphinx_get_key, 0, 0, 0 );
-+ #else
- sphinx_hash_init ( &sphinx_open_tables, system_charset_info, 32, 0, 0,
- sphinx_get_key, 0, 0 );
--
-+ #endif
- #if MYSQL_VERSION_ID > 50100
- handlerton * hton = (handlerton*) p;
- hton->state = SHOW_OPTION_YES;
-@@ -1321,7 +1355,7 @@ CSphSEQuery::~CSphSEQuery ()
- SafeDeleteArray ( m_sQueryBuffer );
- SafeDeleteArray ( m_pWeights );
- SafeDeleteArray ( m_pBuf );
-- for ( int i=0; i<m_dOverrides.elements(); i++ )
-+ for ( int i=0; i<m_dOverrides.sphinx_elements(); i++ )
- SafeDelete ( m_dOverrides.at(i) );
- SPH_VOID_RET();
- }
-@@ -1789,7 +1823,7 @@ bool CSphSEQuery::ParseField ( char * sField )
- pOverride = new CSphSEQuery::Override_t;
- pOverride->m_sName = chop(sName);
- pOverride->m_iType = iType;
-- m_dOverrides.append ( pOverride );
-+ m_dOverrides.sphinx_append ( pOverride );
- }
-
- ulonglong uId = strtoull ( sId, NULL, 10 );
-@@ -1801,8 +1835,8 @@ bool CSphSEQuery::ParseField ( char * sField )
- else
- tValue.m_uValue = (uint32)strtoul ( sValue, NULL, 10 );
-
-- pOverride->m_dIds.append ( uId );
-- pOverride->m_dValues.append ( tValue );
-+ pOverride->m_dIds.sphinx_append ( uId );
-+ pOverride->m_dValues.sphinx_append ( tValue );
- }
-
- if ( !pOverride )
-@@ -1906,11 +1940,11 @@ int CSphSEQuery::BuildRequest ( char ** ppBuffer )
- iReqSize += 8 + strlen(m_sFieldWeight[i] );
- // overrides
- iReqSize += 4;
-- for ( int i=0; i<m_dOverrides.elements(); i++ )
-+ for ( int i=0; i<m_dOverrides.sphinx_elements(); i++ )
- {
- CSphSEQuery::Override_t * pOverride = m_dOverrides.at(i);
- const uint32 uSize = pOverride->m_iType==SPH_ATTR_BIGINT ? 16 : 12; // id64 + value
-- iReqSize += strlen ( pOverride->m_sName ) + 12 + uSize*pOverride->m_dIds.elements();
-+ iReqSize += strlen ( pOverride->m_sName ) + 12 + uSize*pOverride->m_dIds.sphinx_elements();
- }
- // select
- iReqSize += 4;
-@@ -2012,14 +2046,14 @@ int CSphSEQuery::BuildRequest ( char ** ppBuffer )
- SendString ( m_sComment );
-
- // overrides
-- SendInt ( m_dOverrides.elements() );
-- for ( int i=0; i<m_dOverrides.elements(); i++ )
-+ SendInt ( m_dOverrides.sphinx_elements() );
-+ for ( int i=0; i<m_dOverrides.sphinx_elements(); i++ )
- {
- CSphSEQuery::Override_t * pOverride = m_dOverrides.at(i);
- SendString ( pOverride->m_sName );
- SendDword ( pOverride->m_iType );
-- SendInt ( pOverride->m_dIds.elements() );
-- for ( int j=0; j<pOverride->m_dIds.elements(); j++ )
-+ SendInt ( pOverride->m_dIds.sphinx_elements() );
-+ for ( int j=0; j<pOverride->m_dIds.sphinx_elements(); j++ )
- {
- SendUint64 ( pOverride->m_dIds.at(j) );
- if ( pOverride->m_iType==SPH_ATTR_FLOAT )
-@@ -2073,8 +2107,10 @@ ha_sphinx::ha_sphinx ( handlerton * hton, TABLE_ARG * table )
- , m_dUnboundFields ( NULL )
- {
- SPH_ENTER_METHOD();
-+ #if MYSQL_VERSION_ID < 50709
- if ( current_thd )
- current_thd->variables.engine_condition_pushdown = true;
-+ #endif
- SPH_VOID_RET();
- }
-
-diff --git a/storage/sphinx/snippets_udf.cc b/storage/sphinx/snippets_udf.cc
-index d0899e8..e9f7bc0 100644
---- a/storage/sphinx/snippets_udf.cc
-+++ b/storage/sphinx/snippets_udf.cc
-@@ -17,13 +17,16 @@
- #include <string.h>
- #include <assert.h>
-
--#ifndef __WIN__
-+#include <mysql_version.h>
-+
-+#ifndef _WIN32
-+#if MYSQL_VERSION_ID>=50709
-+#include <arpa/inet.h>
-+#endif
- #include <sys/un.h>
- #include <netdb.h>
- #endif
-
--#include <mysql_version.h>
--
- #if MYSQL_VERSION_ID>=50515
- #include "sql_class.h"
- #include "sql_array.h"
-@@ -34,6 +37,13 @@
- #include "../mysql_priv.h"
- #endif
-
-+#ifdef _WIN32
-+#if MYSQL_VERSION_ID>=50709
-+#define in_addr_t uint32
-+#include <winsock2.h>
-+#endif
-+#endif
-+
- #include <mysys_err.h>
- #include <my_sys.h>
-
-@@ -90,7 +100,9 @@ void sphUnalignedWrite ( void * pPtr, const T & tVal )
-
- #define Min(a,b) ((a)<(b)?(a):(b))
-
-+#if !defined(_WIN32)
- typedef unsigned int DWORD;
-+#endif
-
- inline DWORD sphF2DW ( float f ) { union { float f; uint32 d; } u; u.f = f; return u.d; }
-
-@@ -359,7 +371,7 @@ bool CSphUrl::Parse ( const char * sUrl, int iLen )
- int CSphUrl::Connect()
- {
- struct sockaddr_in sin;
--#ifndef __WIN__
-+#ifndef _WIN32
- struct sockaddr_un saun;
- #endif
-
-@@ -426,7 +438,7 @@ int CSphUrl::Connect()
- }
- } else
- {
--#ifndef __WIN__
-+#ifndef _WIN32
- iDomain = AF_UNIX;
- iSockaddrSize = sizeof(saun);
- pSockaddr = (struct sockaddr *) &saun;
diff --git a/mysql-ndb-cpc.init b/mysql-ndb-cpc.init
deleted file mode 100755
index ad159b3..0000000
--- a/mysql-ndb-cpc.init
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/sh
-#
-# mysql-ndb-cpc This shell script takes care of starting and stopping mysql-ndb-cpc.
-#
-# chkconfig: 2345 80 30
-# description: mysql-ndb-cpc is a mysql NDB engine
-#
-# processname: ndbd
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-# Source networking configuration.
-. /etc/sysconfig/network
-
-# Source oident configureation.
-if [ -f /etc/sysconfig/mysql-ndb-cpc ]; then
- . /etc/sysconfig/mysql-ndb-cpc
-fi
-
-# Check that networking is up.
-if is_yes "${NETWORKING}"; then
- if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
- msg_network_down mysql-ndb-cpc
- exit 1
- fi
-else
- exit 0
-fi
-
-start() {
- # Start daemons.
- if [ ! -f /var/lock/subsys/mysql-ndb-cpc ]; then
- msg_starting "mysql ndb_cpcd"
- daemon ndb_cpcd $MYSQL_NDB_CPC_OPT
- RETVAL=$?
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/mysql-ndb-cpc
- else
- msg_already_running "mysql ndb_cpcd"
- fi
-}
-
-stop() {
- # Stop daemons.
- if [ -f /var/lock/subsys/mysql-ndb-cpc ]; then
- msg_stopping "mysql ndb_cpcd"
- killproc ndbd
- rm -f /var/lock/subsys/mysql-ndb-cpc >/dev/null 2>&1
- else
- msg_not_running "mysql ndb_cpcd"
- fi
-}
-
-condrestart() {
- if [ -f /var/lock/subsys/mysql-ndb-cpc ]; then
- stop
- start
- else
- msg_not_running "mysql ndb_cpcd"
- RETVAL=$1
- fi
-}
-
-RETVAL=0
-# See how we were called.
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart)
- stop
- start
- ;;
- try-restart)
- condrestart 0
- ;;
- force-reload)
- condrestart 7
- ;;
- status)
- status ndb_cpcd
- exit $?
- ;;
- *)
- msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
- exit 3
-esac
-
-exit $RETVAL
diff --git a/mysql-ndb-cpc.sysconfig b/mysql-ndb-cpc.sysconfig
deleted file mode 100644
index d6ad0c9..0000000
--- a/mysql-ndb-cpc.sysconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-MYSQL_NDB_CPC_OPT=""
-SERVICE_RUN_NICE_LEVEL="+0"
diff --git a/mysql-ndb-mgm.init b/mysql-ndb-mgm.init
deleted file mode 100755
index 0f9681c..0000000
--- a/mysql-ndb-mgm.init
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/sh
-#
-# mysql-ndb-mgm This shell script takes care of starting and stopping mysql-ndb-mgm.
-#
-# chkconfig: 2345 80 30
-# description: mysql-ndb-mgm is a mysql NDB engine
-#
-# processname: ndbd
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-# Source networking configuration.
-. /etc/sysconfig/network
-
-# Source oident configureation.
-if [ -f /etc/sysconfig/mysql-ndb-mgm ]; then
- . /etc/sysconfig/mysql-ndb-mgm
-fi
-
-# Check that networking is up.
-if is_yes "${NETWORKING}"; then
- if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
- msg_network_down mysql-ndb-mgm
- exit 1
- fi
-else
- exit 0
-fi
-
-start() {
- # Start daemons.
- if [ ! -f /var/lock/subsys/mysql-ndb-mgm ]; then
- msg_starting "mysql ndb_mgmd"
- daemon ndb_mgmd $MYSQL_NDB_MGM_OPT
- RETVAL=$?
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/mysql-ndb-mgm
- else
- msg_already_running "mysql ndb_mgmd"
- fi
-}
-
-stop() {
- # Stop daemons.
- if [ -f /var/lock/subsys/mysql-ndb-mgm ]; then
- msg_stopping "mysql ndb_mgmd"
- killproc ndbd
- rm -f /var/lock/subsys/mysql-ndb-mgm >/dev/null 2>&1
- else
- msg_not_running "mysql ndb_mgmd"
- fi
-}
-
-condrestart() {
- if [ -f /var/lock/subsys/mysql-ndb-mgm ]; then
- stop
- start
- else
- msg_not_running "mysql ndb_mgmd"
- RETVAL=$1
- fi
-}
-
-RETVAL=0
-# See how we were called.
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart)
- stop
- start
- ;;
- try-restart)
- condrestart 0
- ;;
- force-reload)
- condrestart 7
- ;;
- status)
- status ndb_mgmd
- exit $?
- ;;
- *)
- msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
- exit 3
-esac
-
-exit $RETVAL
diff --git a/mysql-ndb-mgm.sysconfig b/mysql-ndb-mgm.sysconfig
deleted file mode 100644
index fc4936f..0000000
--- a/mysql-ndb-mgm.sysconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-MYSQL_NDB_MGM_OPT=""
-SERVICE_RUN_NICE_LEVEL="+0"
diff --git a/mysql-ndb.init b/mysql-ndb.init
deleted file mode 100755
index 0374a48..0000000
--- a/mysql-ndb.init
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/sh
-#
-# mysql-ndb This shell script takes care of starting and stopping mysql-ndb.
-#
-# chkconfig: 2345 80 30
-# description: mysql-ndb is a mysql NDB engine
-#
-# processname: ndbd
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-# Source networking configuration.
-. /etc/sysconfig/network
-
-# Source oident configureation.
-if [ -f /etc/sysconfig/mysql-ndb ]; then
- . /etc/sysconfig/mysql-ndb
-fi
-
-# Check that networking is up.
-if is_yes "${NETWORKING}"; then
- if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
- msg_network_down mysql-ndb
- exit 1
- fi
-else
- exit 0
-fi
-
-start() {
- # Start daemons.
- if [ ! -f /var/lock/subsys/mysql-ndb ]; then
- msg_starting "mysql ndbd"
- daemon ndbd $MYSQL_NDB_OPT
- RETVAL=$?
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/mysql-ndb
- else
- msg_already_running "mysql ndbd"
- fi
-}
-
-stop() {
- # Stop daemons.
- if [ -f /var/lock/subsys/mysql-ndb ]; then
- msg_stopping "mysql ndbd"
- killproc ndbd
- rm -f /var/lock/subsys/mysql-ndb >/dev/null 2>&1
- else
- msg_not_running "mysql ndbd"
- fi
-}
-
-condrestart() {
- if [ -f /var/lock/subsys/mysql-ndb ]; then
- stop
- start
- else
- msg_not_running "mysql ndbd"
- RETVAL=$1
- fi
-}
-
-RETVAL=0
-# See how we were called.
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart)
- stop
- start
- ;;
- try-restart)
- condrestart 0
- ;;
- force-reload)
- condrestart 7
- ;;
- status)
- status ndbd
- exit $?
- ;;
- *)
- msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
- exit 3
-esac
-
-exit $RETVAL
diff --git a/mysql-ndb.sysconfig b/mysql-ndb.sysconfig
deleted file mode 100644
index 8b93682..0000000
--- a/mysql-ndb.sysconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-MYSQL_NDB_OPT=""
-SERVICE_RUN_NICE_LEVEL="+0"
diff --git a/mysql-opt.patch b/mysql-opt.patch
deleted file mode 100644
index b48ce5d..0000000
--- a/mysql-opt.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- mysql-5.7.27/cmake/build_configurations/compiler_options.cmake.orig 2019-06-10 16:43:20.000000000 +0200
-+++ mysql-5.7.27/cmake/build_configurations/compiler_options.cmake 2019-07-29 05:55:55.892824445 +0200
-@@ -50,8 +50,8 @@
- IF(C_NO_EXPENSIVE_OPTIMIZATIONS)
- SET(COMMON_C_FLAGS "${COMMON_C_FLAGS} -fno-expensive-optimizations")
- ENDIF()
-- SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}")
-- SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
-+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
-+ SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}")
- ENDIF()
- IF(CMAKE_COMPILER_IS_GNUCXX)
- SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
-@@ -59,7 +59,7 @@
- EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
- OUTPUT_VARIABLE GXX_VERSION)
- IF(GXX_VERSION VERSION_EQUAL 6.0 OR GXX_VERSION VERSION_GREATER 6.0)
-- SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -std=gnu++03")
-+ SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -std=gnu++11")
- ENDIF()
- # Disable inline optimizations for valgrind testing to avoid false positives
- IF(WITH_VALGRIND)
-@@ -80,15 +80,15 @@
- IF(CXX_NO_EXPENSIVE_OPTIMIZATIONS)
- SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -fno-expensive-optimizations")
- ENDIF()
-- SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}")
-- SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}")
-+ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}")
-+ SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS}")
- ENDIF()
-
- # Default Clang flags
- IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
- SET(COMMON_C_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing")
-- SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}")
-- SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
-+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
-+ SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}")
- ENDIF()
- IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
- SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing")
-@@ -95,11 +95,11 @@
- IF(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 6.0 OR
- CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0)
- IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-- SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -std=gnu++03")
-+ SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -std=gnu++11")
- ENDIF()
- ENDIF()
-- SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}")
-- SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}")
-+ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}")
-+ SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS}")
- ENDIF()
-
- # Solaris flags
diff --git a/mysql-readline.patch b/mysql-readline.patch
index ca2af06..ed53623 100644
--- a/mysql-readline.patch
+++ b/mysql-readline.patch
@@ -1,33 +1,10 @@
---- mysql-8.0.20/client/mysql.cc~ 2020-05-12 19:39:17.000000000 +0200
-+++ mysql-8.0.20/client/mysql.cc 2020-05-12 19:49:31.903300850 +0200
-@@ -79,6 +79,7 @@
+--- mysql-9.7.0/client/mysql.cc~ 2020-05-12 19:39:17.000000000 +0200
++++ mysql-9.7.0/client/mysql.cc 2020-05-12 19:49:31.903300850 +0200
+@@ -94,6 +94,7 @@
#define LOG_USER 0
#else
#include <readline.h>
+#include <history.h>
#include <syslog.h>
-
+
#define HAVE_READLINE
-@@ -1134,22 +1134,6 @@ static COMMANDS commands[] = {
- static const char *load_default_groups[] = {"mysql", "client", nullptr};
-
- #ifdef HAVE_READLINE
--/*
-- HIST_ENTRY is defined for libedit, but not for the real readline
-- Need to redefine it for real readline to find it
--*/
--#if !defined(HAVE_HIST_ENTRY)
--typedef struct _hist_entry {
-- const char *line;
-- const char *data;
--} HIST_ENTRY;
--#endif
--
--extern "C" int add_history(const char *command); /* From readline directory */
--extern "C" int read_history(const char *command);
--extern "C" int write_history(const char *command);
--extern "C" HIST_ENTRY *history_get(int num);
--extern "C" int history_length;
- static int not_in_history(const char *line);
- static void initialize_readline(char *name);
- #endif /* HAVE_READLINE */
diff --git a/mysql-sphinx.patch b/mysql-sphinx.patch
deleted file mode 100644
index dac55bd..0000000
--- a/mysql-sphinx.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- mysql-5.1.49/storage/sphinx/Makefile.am~ 2009-02-13 23:26:46.000000000 +0200
-+++ mysql-5.1.49/storage/sphinx/Makefile.am 2010-07-24 16:35:57.568716704 +0300
-@@ -31,7 +31,7 @@
- LDADD =
-
- DEFS= @DEFS@ \
-- -D_REENTRANT -D_PTHREADS -DENGINE -DSTORAGE_ENGINE -DMYSQL_SERVER
-+ -D_REENTRANT -D_PTHREADS -DSTORAGE_ENGINE -DMYSQL_SERVER
-
- noinst_HEADERS = ha_sphinx.h
-
---- mysql-5.1.49/storage/sphinx/Makefile.am~ 2010-07-24 16:37:48.000000000 +0300
-+++ mysql-5.1.49/storage/sphinx/Makefile.am 2010-07-24 17:00:56.161565823 +0300
-@@ -38,7 +38,7 @@
- EXTRA_LTLIBRARIES = ha_sphinx.la
- pkgplugin_LTLIBRARIES = @plugin_sphinx_shared_target@ sphinx.la
-
--ha_sphinx_la_LDFLAGS = -module -rpath $(MYSQLLIBdir)
-+ha_sphinx_la_LDFLAGS = -module -avoid-version -rpath $(MYSQLLIBdir)
- ha_sphinx_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
- ha_sphinx_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
- ha_sphinx_la_SOURCES = ha_sphinx.cc
---- mysql-5.1.49/storage/sphinx/Makefile.am~ 2010-07-24 19:14:55.000000000 +0300
-+++ mysql-5.1.49/storage/sphinx/Makefile.am 2010-07-25 03:47:56.660771099 +0300
-@@ -43,7 +43,7 @@
- ha_sphinx_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
- ha_sphinx_la_SOURCES = ha_sphinx.cc
-
--sphinx_la_LDFLAGS = -module
-+sphinx_la_LDFLAGS = -module -avoid-version -rpath $(MYSQLLIBdir)
- sphinx_la_CXXFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
- sphinx_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
- sphinx_la_SOURCES = snippets_udf.cc
diff --git a/mysql-system-xxhash.patch b/mysql-system-xxhash.patch
deleted file mode 100644
index 9ca5514..0000000
--- a/mysql-system-xxhash.patch
+++ /dev/null
@@ -1,168 +0,0 @@
---- 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 <xxhash.h>
-
- #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 <xxhash.h>
-
- #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 <xxhash.h>
- #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 <xxhash.h>
- #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 <xxhash.h>
-
- namespace innodb_ut0rnd_unittest {
-
diff --git a/mysqldumpslow-clusters.patch b/mysqldumpslow-clusters.patch
deleted file mode 100644
index 415ab93..0000000
--- a/mysqldumpslow-clusters.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- percona-server-5.6.20-68.0/scripts/mysqldumpslow.sh~ 2014-08-29 10:58:05.000000000 +0300
-+++ percona-server-5.6.20-68.0/scripts/mysqldumpslow.sh 2014-09-06 20:50:22.000000000 +0300
-@@ -51,8 +51,33 @@
-
- $opt{'help'} and usage();
-
-+# find config file for first defined cluster
-+sub get_defaults_file {
-+ my $clusters_file = '/etc/mysql/clusters.conf';
-+ return unless -f $clusters_file;
-+
-+ open(my $fh , "< $clusters_file") or return;
-+ while (<$fh>) {
-+ my ($config, $clusterdir) = m{^([^#]+)\s*=\s*(.+)$};
-+ next unless $config;
-+
-+ if ($config !~ m{/}) {
-+ my $f = "/etc/mysql/$config";
-+ return $f if -f $f;
-+
-+ my $f = "$clusterdir/$config";
-+ return $f if -f $f;
-+ }
-+ return $config;
-+ }
-+ close($fh) or die $!;
-+ return undef;
-+}
-+
- unless (@ARGV) {
-- my $defaults = `my_print_defaults mysqld`;
-+ my $defaults_file = get_defaults_file;
-+ my $defaults_arg = "-c $defaults_file" if $defaults_file;
-+ my $defaults = `my_print_defaults $defaults_arg mysqld`;
- my $basedir = ($defaults =~ m/--basedir=(.*)/)[0]
- or die "Can't determine basedir from 'my_print_defaults mysqld' output: $defaults";
- warn "basedir=$basedir\n" if $opt{v};
-@@ -61,7 +86,7 @@
- my $slowlog = ($defaults =~ m/--slow-query-log-file=(.*)/)[0];
- if (!$datadir or $opt{i}) {
- # determine the datadir from the instances section of /etc/my.cnf, if any
-- my $instances = `my_print_defaults instances`;
-+ my $instances = `my_print_defaults $defaults_arg instances`;
- die "Can't determine datadir from 'my_print_defaults mysqld' output: $defaults"
- unless $instances;
- my @instances = ($instances =~ m/^--(\w+)-/mg);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mysql.git/commitdiff/5e0763c0ac5b00d6b8aea9152b1b723ddd408af3
More information about the pld-cvs-commit
mailing list