diff --git a/boost_1_73_0.tar.gz.aa b/boost_1_73_0.tar.gz.aa deleted file mode 100644 index 8865b3fa69add09a102cccb57224be2041d4395a..0000000000000000000000000000000000000000 Binary files a/boost_1_73_0.tar.gz.aa and /dev/null differ diff --git a/boost_1_73_0.tar.gz.ab b/boost_1_73_0.tar.gz.ab deleted file mode 100644 index ada818e80681d9a26e5058c57c666483d64095e1..0000000000000000000000000000000000000000 Binary files a/boost_1_73_0.tar.gz.ab and /dev/null differ diff --git a/boost_1_73_0.tar.gz.ac b/boost_1_73_0.tar.gz.ac deleted file mode 100644 index 28deedc76864bc91cd14f4c7df61a7095f42d69b..0000000000000000000000000000000000000000 Binary files a/boost_1_73_0.tar.gz.ac and /dev/null differ diff --git a/boost_1_73_0.tar.gz b/boost_1_77_0.tar.xz similarity index 100% rename from boost_1_73_0.tar.gz rename to boost_1_77_0.tar.xz diff --git a/greatsql-8.0.25-16.tar.gz.ah b/boost_1_77_0.tar.xz.aa similarity index 79% rename from greatsql-8.0.25-16.tar.gz.ah rename to boost_1_77_0.tar.xz.aa index 8e0f9409060bebade2a0453ac6f7be8a9600c98f..dbb486bfc61bd06d448d7c96b5cc44a6e277ea74 100644 Binary files a/greatsql-8.0.25-16.tar.gz.ah and b/boost_1_77_0.tar.xz.aa differ diff --git a/boost_1_77_0.tar.xz.ab b/boost_1_77_0.tar.xz.ab new file mode 100644 index 0000000000000000000000000000000000000000..0e60bf349cd66903005236a3c2f547ba5efbfd9c Binary files /dev/null and b/boost_1_77_0.tar.xz.ab differ diff --git a/greatsql-8.0.25-16.tar.gz.aa b/greatsql-8.0.25-16.tar.gz.aa deleted file mode 100644 index 21161114d00bdd45056d94055aa0fecabc24c8a8..0000000000000000000000000000000000000000 Binary files a/greatsql-8.0.25-16.tar.gz.aa and /dev/null differ diff --git a/greatsql-8.0.25-16.tar.gz.ab b/greatsql-8.0.25-16.tar.gz.ab deleted file mode 100644 index bd5d6967df167b6b3feb7bd3e84872b5055c8247..0000000000000000000000000000000000000000 Binary files a/greatsql-8.0.25-16.tar.gz.ab and /dev/null differ diff --git a/greatsql-8.0.25-16.tar.gz.ac b/greatsql-8.0.25-16.tar.gz.ac deleted file mode 100644 index e9a545f863fe5a14417e1069f0d6f995caa6f7f6..0000000000000000000000000000000000000000 Binary files a/greatsql-8.0.25-16.tar.gz.ac and /dev/null differ diff --git a/greatsql-8.0.25-16.tar.gz.ai b/greatsql-8.0.25-16.tar.gz.ai deleted file mode 100644 index d8101c3539b14217d9e8fe50516dcac2a36ff8a4..0000000000000000000000000000000000000000 Binary files a/greatsql-8.0.25-16.tar.gz.ai and /dev/null differ diff --git a/greatsql-8.0.25-16.tar.gz.ak b/greatsql-8.0.25-16.tar.gz.ak deleted file mode 100644 index e377a323cf9616070e74498099e7663d4d2ee4f2..0000000000000000000000000000000000000000 Binary files a/greatsql-8.0.25-16.tar.gz.ak and /dev/null differ diff --git a/greatsql-8.0.25-16.tar.gz b/greatsql-8.0.32-24.tar.xz similarity index 100% rename from greatsql-8.0.25-16.tar.gz rename to greatsql-8.0.32-24.tar.xz diff --git a/greatsql-8.0.25-16.tar.gz.ad b/greatsql-8.0.32-24.tar.xz.aa similarity index 79% rename from greatsql-8.0.25-16.tar.gz.ad rename to greatsql-8.0.32-24.tar.xz.aa index 9174d1ed6aab4ee1a534e934248e6981045428f0..73e9b9bdc7b01d1ad1f8e0361b731a837d399fe2 100644 Binary files a/greatsql-8.0.25-16.tar.gz.ad and b/greatsql-8.0.32-24.tar.xz.aa differ diff --git a/greatsql-8.0.32-24.tar.xz.ab b/greatsql-8.0.32-24.tar.xz.ab new file mode 100644 index 0000000000000000000000000000000000000000..9a8cb9938b7fd7af0e083ce26d5a651c182a8562 Binary files /dev/null and b/greatsql-8.0.32-24.tar.xz.ab differ diff --git a/greatsql-8.0.32-24.tar.xz.ac b/greatsql-8.0.32-24.tar.xz.ac new file mode 100644 index 0000000000000000000000000000000000000000..f4a628090d15ec3a636b0eb6b203fcd7f2a4665b Binary files /dev/null and b/greatsql-8.0.32-24.tar.xz.ac differ diff --git a/greatsql-8.0.25-16.tar.gz.ag b/greatsql-8.0.32-24.tar.xz.ad similarity index 80% rename from greatsql-8.0.25-16.tar.gz.ag rename to greatsql-8.0.32-24.tar.xz.ad index 24443591293147ef7b650a896f267eb9d81fe3ae..1aba014c9e35bce430ce65af15472cce3e393214 100644 Binary files a/greatsql-8.0.25-16.tar.gz.ag and b/greatsql-8.0.32-24.tar.xz.ad differ diff --git a/greatsql-8.0.25-16.tar.gz.aj b/greatsql-8.0.32-24.tar.xz.ae similarity index 80% rename from greatsql-8.0.25-16.tar.gz.aj rename to greatsql-8.0.32-24.tar.xz.ae index 51c22df1114b8fdb4e46ef21147c97dcf5b18e18..f22a4977a13c0386f07905703b03e0947177803b 100644 Binary files a/greatsql-8.0.25-16.tar.gz.aj and b/greatsql-8.0.32-24.tar.xz.ae differ diff --git a/greatsql-8.0.25-16.tar.gz.ae b/greatsql-8.0.32-24.tar.xz.af similarity index 80% rename from greatsql-8.0.25-16.tar.gz.ae rename to greatsql-8.0.32-24.tar.xz.af index 74d2856ffed4439382c8d89054e2d4e78de8a40c..88ea7094d497d4c55dea4cd66f1de4cf5e51d419 100644 Binary files a/greatsql-8.0.25-16.tar.gz.ae and b/greatsql-8.0.32-24.tar.xz.af differ diff --git a/greatsql-8.0.25-16.tar.gz.af b/greatsql-8.0.32-24.tar.xz.ag similarity index 81% rename from greatsql-8.0.25-16.tar.gz.af rename to greatsql-8.0.32-24.tar.xz.ag index 1131519f522f16ec823417a68a1d1ffb47cafd7a..460d811942ed1986668d63662100f75f46b7b9b3 100644 Binary files a/greatsql-8.0.25-16.tar.gz.af and b/greatsql-8.0.32-24.tar.xz.ag differ diff --git a/greatsql-8.0.32-24.tar.xz.ah b/greatsql-8.0.32-24.tar.xz.ah new file mode 100644 index 0000000000000000000000000000000000000000..72a30cff0282bb1ae9ee07c03b46c26b2d49465e Binary files /dev/null and b/greatsql-8.0.32-24.tar.xz.ah differ diff --git a/greatsql.spec b/greatsql.spec index e7bdd86eee34649c2ba5c51e733935286b774f9f..095eee74f3413d56585ac2ec2b9a4091c1f8d76f 100644 --- a/greatsql.spec +++ b/greatsql.spec @@ -3,11 +3,11 @@ %global greatsql_vendor GreatDB Software Co., Ltd. %global mysqldatadir /var/lib/mysql -%global mysql_version 8.0.25 -%global greatsql_version 16 -%global revision 8bb0e5af297 +%global mysql_version 8.0.32 +%global greatsql_version 24 +%global revision 3714067bc8c %global tokudb_backup_version %{mysql_version}-%{greatsql_version} -%global rpm_release 5 +%global rpm_release 1 %global release %{greatsql_version}.%{rpm_release}%{?dist} @@ -28,6 +28,7 @@ # Regression tests may take a long time, override the default to skip them %{!?runselftest:%global runselftest 0} +%{!?with_systemd: %global systemd 0} %global systemd 1 %{!?with_debuginfo: %global nodebuginfo 0} %{!?product_suffix: %global product_suffix -80} @@ -49,13 +50,11 @@ # Setup cmake flags for RocksDB %if 0%{?rocksdb} - %global ROCKSDB_FLAGS -DWITH_ROCKSDB=1 + %global ROCKSDB_FLAGS -DWITH_ROCKSDB=0 %else %global ROCKSDB_FLAGS -DWITH_ROCKSDB=0 %endif -# On rhel 5/6 we still have renamed library to libperconaserverclient - %global shared_lib_pri_name mysqlclient %global shared_lib_sec_name perconaserverclient @@ -71,7 +70,7 @@ %global __os_install_post /usr/lib/rpm/brp-compress %{nil} %endif -%global license_files_server %{src_dir}/README +%global license_files_server %{src_dir}/README.md %global license_type GPLv2 Name: greatsql @@ -80,24 +79,20 @@ Group: Applications/Databases Version: %{mysql_version} Release: %{release} License: Copyright (c) 2000, 2018, %{mysql_vendor}. All rights reserved. Under %{?license_type} license as shown in the Description field.. -SOURCE0: greatsql-8.0.25-16.tar.gz -SOURCE101: greatsql-8.0.25-16.tar.gz.aa -SOURCE102: greatsql-8.0.25-16.tar.gz.ab -SOURCE103: greatsql-8.0.25-16.tar.gz.ac -SOURCE104: greatsql-8.0.25-16.tar.gz.ad -SOURCE105: greatsql-8.0.25-16.tar.gz.ae -SOURCE106: greatsql-8.0.25-16.tar.gz.af -SOURCE107: greatsql-8.0.25-16.tar.gz.ag -SOURCE108: greatsql-8.0.25-16.tar.gz.ah -SOURCE109: greatsql-8.0.25-16.tar.gz.ai -SOURCE110: greatsql-8.0.25-16.tar.gz.aj -SOURCE111: greatsql-8.0.25-16.tar.gz.ak -URL: https://gitee.com/GreatSQL/GreatSQL +SOURCE0: greatsql-8.0.32-24.tar.xz +SOURCE101: greatsql-8.0.32-24.tar.xz.aa +SOURCE102: greatsql-8.0.32-24.tar.xz.ab +SOURCE103: greatsql-8.0.32-24.tar.xz.ac +SOURCE104: greatsql-8.0.32-24.tar.xz.ad +SOURCE105: greatsql-8.0.32-24.tar.xz.ae +SOURCE106: greatsql-8.0.32-24.tar.xz.af +SOURCE107: greatsql-8.0.32-24.tar.xz.ag +SOURCE108: greatsql-8.0.32-24.tar.xz.ah +URL: https://greatsql.cn SOURCE5: mysql_config.sh -SOURCE10: boost_1_73_0.tar.gz -SOURCE201: boost_1_73_0.tar.gz.aa -SOURCE202: boost_1_73_0.tar.gz.ab -SOURCE203: boost_1_73_0.tar.gz.ac +SOURCE10: boost_1_77_0.tar.xz +SOURCE201: boost_1_77_0.tar.xz.aa +SOURCE202: boost_1_77_0.tar.xz.ab SOURCE90: filter-provides.sh SOURCE91: filter-requires.sh SOURCE11: mysqld.cnf @@ -107,8 +102,8 @@ BuildRequires: make BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: perl -BuildRequires: perl(Time::HiRes) -BuildRequires: perl(Env) +BuildRequires: perl(Time::HiRes)} +BuildRequires: perl(Env)} BuildRequires: perl(Carp) BuildRequires: perl(Config) BuildRequires: perl(Cwd) @@ -174,7 +169,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %description GreatSQL focuses on improving the reliability and performance of MGR, supports InnoDB parallel query and other features, and is a domestic MySQL version suitable for financial applications. It can be used as an optional replacement of MySQL or Percona Server. It is completely free and compatible with MySQL or Percona server. -For a description of GreatSQL see https://gitee.com/GreatSQL/GreatSQL +For a description of GreatSQL see https://greatsql.cn %package -n greatsql-server Summary: GreatSQL: Open source database that can be used to replace MySQL or Percona Server. @@ -185,8 +180,9 @@ Requires: grep Requires: procps Requires: shadow-utils Requires: net-tools -Requires(pre): greatsql-shared greatsql-mysql-config +Requires(pre): greatsql-shared Requires: greatsql-client +Requires: greatsql-icu-data-files Requires: compat-openssl11-devel Conflicts: Percona-SQL-server-50 Percona-Server-server-51 Percona-Server-server-55 Percona-Server-server-56 Percona-Server-server-57 @@ -214,7 +210,7 @@ Conflicts: Percona-SQL-client-50 Percona-Server-client-51 Percona-Server-cl %description -n greatsql-client This package contains the standard GreatSQL client and administration tools. -For a description of GreatSQL see https://gitee.com/GreatSQL/GreatSQL +For a description of GreatSQL see https://greatsql.cn %package -n greatsql-test Summary: Test suite for the GreatSQL @@ -256,7 +252,7 @@ Conflicts: Percona-SQL-test-50 Percona-Server-test-51 Percona-Server-test-5 %description -n greatsql-test This package contains the GreatSQL regression test suite. -For a description of GreatSQL see https://gitee.com/GreatSQL/GreatSQL +For a description of GreatSQL see https://greatsql.cn %package -n greatsql-devel Summary: GreatSQL - Development header files and libraries @@ -269,7 +265,7 @@ Obsoletes: mariadb-devel This package contains the development header files and libraries necessary to develop GreatSQL client applications. -For a description of GreatSQL see https://gitee.com/GreatSQL/GreatSQL +For a description of GreatSQL see https://greatsql.cn %package -n greatsql-shared Summary: GreatSQL - Shared libraries @@ -280,7 +276,7 @@ Obsoletes: mysql-libs < %{version}-%{release} This package contains the shared libraries (*.so*) which certain languages and applications need to dynamically load and use GreatSQL. -For a description of GreatSQL see https://gitee.com/GreatSQL/GreatSQL +For a description of GreatSQL see https://greatsql.cn %if 0%{?compatlib} %package -n greatsql-shared-compat @@ -335,7 +331,7 @@ Obsoletes: greatsql-mysql-router < %{version}-%{release} The GreatSQL MySQL Router software delivers a fast, multi-threaded way of routing connections from GreatSQL Clients to GreatSQL Servers. -For a description of GreatSQL see https://gitee.com/GreatSQL/GreatSQL +For a description of GreatSQL see https://greatsql.cn %package -n greatsql-mysql-router-devel Summary: Development header files and libraries for GreatSQL MySQL Router @@ -347,7 +343,7 @@ Obsoletes: mysql-router-devel This package contains the development header files and libraries necessary to develop GreatSQL MySQL Router applications. -For a description of GreatSQL see https://gitee.com/GreatSQL/GreatSQL +For a description of GreatSQL see https://greatsql.cn %package -n greatsql-mysql-config Summary: GreatSQL config @@ -355,11 +351,18 @@ Provides: greatsql-mysql-config = %{version}-%{release} Conflicts: mysql-config %description -n greatsql-mysql-config -For a description of GreatSQL see https://gitee.com/GreatSQL/GreatSQL +For a description of GreatSQL see https://greatsql.cn + +%package -n greatsql-icu-data-files +Summary: GreatSQL packaging of ICU data files + +%description -n greatsql-icu-data-files +This package contains ICU data files needer by GreatSQL regular expressions. + %prep -cat %{SOURCE201} %{SOURCE202} %{SOURCE203} > %{SOURCE10} -cat %{SOURCE101} %{SOURCE102} %{SOURCE103} %{SOURCE104} %{SOURCE105} %{SOURCE106} %{SOURCE107} %{SOURCE108} %{SOURCE109} %{SOURCE110} %{SOURCE111} > %{SOURCE0} +cat %{SOURCE201} %{SOURCE202} > %{SOURCE10} +cat %{SOURCE101} %{SOURCE102} %{SOURCE103} %{SOURCE104} %{SOURCE105} %{SOURCE106} %{SOURCE107} %{SOURCE108} > %{SOURCE0} %setup -q -T -a 0 -a 10 -c -n %{src_dir} pushd %{src_dir} %patch0 -p0 @@ -382,6 +385,7 @@ mkdir debug cd debug # Attempt to remove any optimisation flags from the debug build optflags=$(echo "%{optflags}" | sed -e 's/-O2 / /' -e 's/-Wp,-D_FORTIFY_SOURCE=2/ -Wno-missing-field-initializers -Wno-error /') + optflags=$(echo $optflags | sed -e 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-hardened-cc1 -specs=\/usr\/lib\/rpm\/redhat\/redhat-annobin-cc1/ /') cmake ../%{src_dir} \ -DBUILD_CONFIG=mysql_release \ -DINSTALL_LAYOUT=RPM \ @@ -399,15 +403,19 @@ mkdir debug -DINSTALL_MYSQLSHAREDIR=share/greatsql \ -DINSTALL_SUPPORTFILESDIR=share/greatsql \ -DFEATURE_SET="%{feature_set}" \ + -DWITH_AUTHENTICATION_LDAP=OFF \ -DWITH_PAM=1 \ - -DWITH_ROCKSDB=1 \ - -DROCKSDB_DISABLE_AVX2=1 \ - -DROCKSDB_DISABLE_MARCH_NATIVE=1 \ + -DWITH_ROCKSDB=0 \ + -DALLOW_NO_SSE42=ON \ + -DROCKSDB_DISABLE_AVX2=0 \ + -DROCKSDB_DISABLE_MARCH_NATIVE=0 \ + -DGROUP_REPLICATION_WITH_ROCKSDB=OFF \ + -DWITH_TOKUDB=0 \ + -DWITH_INNODB_MEMCACHED=1 \ -DMYSQL_MAINTAINER_MODE=OFF \ -DFORCE_INSOURCE_BUILD=1 \ -DWITH_NUMA=ON \ -DWITH_LDAP=system \ - -DWITH_PACKAGE_FLAGS=OFF \ -DWITH_SYSTEM_LIBS=ON \ -DWITH_PROTOBUF=bundled \ -DWITH_RAPIDJSON=bundled \ @@ -418,6 +426,7 @@ mkdir debug -DWITH_READLINE=system \ -DWITH_LIBEVENT=bundled \ -DWITH_KEYRING_VAULT=ON \ + -DWITH_FIDO=bundled \ %{?ssl_option} \ %{?mecab_option} \ -DCOMPILATION_COMMENT="%{compilation_comment_debug}" %{TOKUDB_FLAGS} %{TOKUDB_DEBUG_OFF} %{ROCKSDB_FLAGS} @@ -445,15 +454,19 @@ mkdir release -DINSTALL_MYSQLSHAREDIR=share/greatsql \ -DINSTALL_SUPPORTFILESDIR=share/greatsql \ -DFEATURE_SET="%{feature_set}" \ + -DWITH_AUTHENTICATION_LDAP=OFF \ -DWITH_PAM=1 \ - -DWITH_ROCKSDB=1 \ - -DROCKSDB_DISABLE_AVX2=1 \ - -DROCKSDB_DISABLE_MARCH_NATIVE=1 \ + -DWITH_ROCKSDB=0 \ + -DROCKSDB_DISABLE_AVX2=0 \ + -DROCKSDB_DISABLE_MARCH_NATIVE=0 \ + -DWITH_TOKUDB=0 \ + -DGROUP_REPLICATION_WITH_ROCKSDB=OFF \ + -DALLOW_NO_SSE42=ON \ + -DWITH_INNODB_MEMCACHED=1 \ -DMYSQL_MAINTAINER_MODE=OFF \ -DFORCE_INSOURCE_BUILD=1 \ -DWITH_NUMA=ON \ -DWITH_LDAP=system \ - -DWITH_PACKAGE_FLAGS=OFF \ -DWITH_SYSTEM_LIBS=ON \ -DWITH_LZ4=bundled \ -DWITH_ZLIB=bundled \ @@ -464,6 +477,7 @@ mkdir release -DWITH_LIBEVENT=bundled \ -DWITH_ZSTD=bundled \ -DWITH_KEYRING_VAULT=ON \ + -DWITH_FIDO=bundled \ %{?ssl_option} \ %{?mecab_option} \ -DCOMPILATION_COMMENT="%{compilation_comment_release}" %{TOKUDB_FLAGS} %{TOKUDB_DEBUG_OFF} %{ROCKSDB_FLAGS} @@ -472,6 +486,7 @@ mkdir release ) %install +%define _unpackaged_files_terminate_build 0 MBD=$RPM_BUILD_DIR/%{src_dir} # Ensure that needed directories exists @@ -492,9 +507,16 @@ make DESTDIR=%{buildroot} install #install -D -m 0644 packaging/rpm-common/mysql.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/mysql #investigate this logrotate install -D -m 0644 $MBD/release/support-files/mysql-log-rotate %{buildroot}%{_sysconfdir}/logrotate.d/mysql +install -D -m 0644 $MBD/%{src_dir}/build-ps/rpm/mysqld.cnf %{buildroot}%{_sysconfdir}/my.cnf install -D -p -m 0644 %{_builddir}/greatsql-%{version}-%{greatsql_version}/greatsql-%{version}-%{greatsql_version}/scripts/mysqld.cnf %{buildroot}%{_sysconfdir}/my.cnf install -d %{buildroot}%{_sysconfdir}/my.cnf.d +#%if 0%{?systemd} +#%else +#%if 0%{?rhel} < 7 +# install -D -m 0755 $MBD/%{src_dir}/build-ps/rpm/mysql.init %{buildroot}%{_sysconfdir}/init.d/mysql +#%endif + # Add libdir to linker install -d -m 0755 %{buildroot}%{_sysconfdir}/ld.so.conf.d @@ -507,19 +529,30 @@ echo "%{_libdir}/mysql" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/mysql-%{_arch} %endif %if 0%{?systemd} +install -D -p -m 0644 scripts/mysqlrouter.service %{buildroot}%{_unitdir}/mysqlrouter.service +#install -D -p -m 0644 packaging/rpm-common/mysqlrouter.conf %{buildroot}%{_tmpfilesdir}/mysqlrouter.conf +#install -D -p -m 0644 packaging/rpm-common/mysqlrouter.tmpfiles.d %{buildroot}%{_tmpfilesdir}/mysqlrouter.conf %else install -D -p -m 0755 packaging/rpm-common/mysqlrouter.init %{buildroot}%{_sysconfdir}/init.d/mysqlrouter %endif install -D -p -m 0644 packaging/rpm-common/mysqlrouter.conf %{buildroot}%{_sysconfdir}/mysqlrouter/mysqlrouter.conf +# set rpath for plugin to use private/libfido2.so +#patchelf --debug --set-rpath '$ORIGIN/../private' %{buildroot}/%{_libdir}/mysql/plugin/authentication_fido.so + # Remove files pages we explicitly do not want to package rm -rf %{buildroot}%{_infodir}/mysql.info* rm -rf %{buildroot}%{_datadir}/greatsql/mysql.server rm -rf %{buildroot}%{_datadir}/greatsql/mysqld_multi.server rm -f %{buildroot}%{_datadir}/greatsql/win_install_firewall.sql +rm -f %{buildroot}%{_datadir}/greatsql/audit_log_filter_win_install.sql rm -rf %{buildroot}%{_bindir}/mysql_embedded rm -rf %{buildroot}/usr/cmake/coredumper-relwithdebinfo.cmake rm -rf %{buildroot}/usr/cmake/coredumper.cmake +rm -rf %{buildroot}/usr/include/kmip.h +rm -rf %{buildroot}/usr/include/kmippp.h +rm -rf %{buildroot}/usr/lib/libkmip.a +rm -rf %{buildroot}/usr/lib/libkmippp.a %if 0%{?tokudb} rm -f %{buildroot}%{_prefix}/README.md rm -f %{buildroot}%{_prefix}/COPYING.AGPLv3 @@ -718,6 +751,8 @@ fi %attr(644, root, root) %{_mandir}/man1/myisampack.1* %attr(644, root, root) %{_mandir}/man8/mysqld.8* %if 0%{?systemd} +%exclude %{_mandir}/man1/mysqld_multi.1* +%exclude %{_mandir}/man1/mysqld_safe.1* %else %attr(644, root, root) %{_mandir}/man1/mysqld_multi.1* %attr(644, root, root) %{_mandir}/man1/mysqld_safe.1* @@ -726,12 +761,16 @@ fi %attr(644, root, root) %{_mandir}/man1/mysql_secure_installation.1* %attr(644, root, root) %{_mandir}/man1/mysql_upgrade.1* %attr(644, root, root) %{_mandir}/man1/mysqlman.1* +#%attr(644, root, root) %{_mandir}/man1/mysql.server.1* %attr(644, root, root) %{_mandir}/man1/mysql_tzinfo_to_sql.1* %attr(644, root, root) %{_mandir}/man1/perror.1* %attr(644, root, root) %{_mandir}/man1/mysql_ssl_rsa_setup.1* %attr(644, root, root) %{_mandir}/man1/lz4_decompress.1* %attr(644, root, root) %{_mandir}/man1/zlib_decompress.1* +%config(noreplace) %{_sysconfdir}/my.cnf +%dir %{_sysconfdir}/my.cnf.d + %attr(755, root, root) %{_bindir}/comp_err %attr(755, root, root) %{_bindir}/innochecksum %attr(755, root, root) %{_bindir}/ibd2sdi @@ -764,6 +803,11 @@ fi %attr(755, root, root) %{_libdir}/mysql/private/libprotobuf.so.* %dir %{_libdir}/mysql/plugin +%attr(755, root, root) %{_libdir}/mysql/plugin/component_keyring_file.so +%attr(755, root, root) %{_libdir}/mysql/plugin/procfs.so +%attr(755, root, root) %{_libdir}/mysql/plugin/binlog_utils_udf.so +%attr(755, root, root) %{_libdir}/mysql/plugin/component_query_attributes.so +%attr(755, root, root) %{_libdir}/mysql/plugin/component_reference_cache.so %attr(755, root, root) %{_libdir}/mysql/plugin/adt_null.so %attr(755, root, root) %{_libdir}/mysql/plugin/auth_socket.so %attr(755, root, root) %{_libdir}/mysql/plugin/authentication_ldap_sasl_client.so @@ -801,11 +845,29 @@ fi %attr(755, root, root) %{_libdir}/mysql/plugin/component_test_udf_services.so %attr(755, root, root) %{_libdir}/mysql/plugin/authentication_ldap_simple.so %attr(755, root, root) %{_libdir}/mysql/plugin/component_test_component_deinit.so +%attr(755, root, root) %{_libdir}/mysql/plugin/greatdb_ha.so +%attr(755, root, root) %{_libdir}/mysql/plugin/semisync_replica.so +%attr(755, root, root) %{_libdir}/mysql/plugin/semisync_source.so %attr(755, root, root) %{_libdir}/mysql/plugin/binlog_utils_udf.so %attr(755, root, root) %{_libdir}/mysql/plugin/test_udf_wrappers.so %attr(755, root, root) %{_libdir}/mysql/plugin/component_reference_cache.so - +%attr(755, root, root) %{_libdir}/mysql/plugin/test_services_command_services.so +#%attr(755, root, root) %{_libdir}/mysql/plugin/tokudb_backup.so +%attr(755, root, root) %{_libdir}/mysql/plugin/authentication_kerberos_client.so +%attr(755, root, root) %{_libdir}/mysql/plugin/authentication_ldap_sasl.so +%attr(755, root, root) %{_libdir}/mysql/plugin/authentication_oci_client.so +%attr(755, root, root) %{_libdir}/mysql/plugin/component_encryption_udf.so +%attr(755, root, root) %{_libdir}/mysql/plugin/component_keyring_kmip.so +%attr(755, root, root) %{_libdir}/mysql/plugin/component_keyring_kms.so +%attr(755, root, root) %{_libdir}/mysql/plugin/component_test_mysql_command_services.so +%attr(755, root, root) %{_libdir}/mysql/plugin/component_test_mysql_system_variable_set.so +%attr(755, root, root) %{_libdir}/mysql/plugin/component_test_sensitive_system_variables.so +%attr(755, root, root) %{_libdir}/mysql/plugin/component_test_status_var_reader.so +%attr(755, root, root) %{_libdir}/mysql/plugin/component_test_table_access.so +%attr(755, root, root) %{_libdir}/mysql/plugin/conflicting_variables.so %dir %{_libdir}/mysql/plugin/debug +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/component_keyring_file.so +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/procfs.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/data_masking.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/adt_null.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_socket.so @@ -844,13 +906,36 @@ fi %attr(755, root, root) %{_libdir}/mysql/plugin/debug/component_test_udf_services.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/component_test_component_deinit.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/binlog_utils_udf.so +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/component_query_attributes.so +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/component_reference_cache.so +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/libtest_sql_sleep_is_connected.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/test_udf_wrappers.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/component_reference_cache.so +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/authentication_kerberos_client.so +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/authentication_ldap_sasl.so +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/authentication_oci_client.so +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/component_encryption_udf.so +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/component_keyring_kmip.so +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/component_keyring_kms.so +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/component_test_mysql_command_services.so +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/component_test_mysql_system_variable_set.so +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/component_test_sensitive_system_variables.so +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/component_test_status_var_reader.so +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/component_test_table_access.so +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/conflicting_variables.so +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/greatdb_ha.so +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_replica.so +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_source.so +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/test_services_command_services.so +#%attr(755, root, root) %{_libdir}/mysql/plugin/debug/tokudb_backup.so %if 0%{?mecab} %{_libdir}/mysql/mecab %attr(755, root, root) %{_libdir}/mysql/plugin/libpluginmecab.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/libpluginmecab.so %endif +#coredumper +%attr(755, root, root) %{_includedir}/coredumper/coredumper.h +%attr(755, root, root) /usr/lib/libcoredumper.a # Percona plugins %attr(755, root, root) %{_libdir}/mysql/plugin/audit_log.so #%attr(644, root, root) %{_datadir}/mysql-*/audit_log_filter_linux_install.sql @@ -949,12 +1034,14 @@ fi %attr(755, root, root) %{_bindir}/mysqlbinlog %attr(755, root, root) %{_bindir}/mysqlcheck %attr(755, root, root) %{_bindir}/mysqldump +%attr(755, root, root) %{_bindir}/mysqldecrypt %attr(755, root, root) %{_bindir}/mysqlimport %attr(755, root, root) %{_bindir}/mysqlpump %attr(755, root, root) %{_bindir}/mysqlshow %attr(755, root, root) %{_bindir}/mysqlslap %attr(755, root, root) %{_bindir}/mysql_config_editor %attr(755, root, root) %{_bindir}/mysql_migrate_keyring +%attr(755, root, root) %{_bindir}/mysql_keyring_encryption_test %attr(644, root, root) %{_mandir}/man1/mysql.1* %attr(644, root, root) %{_mandir}/man1/mysqladmin.1* @@ -1001,6 +1088,8 @@ fi %attr(755, root, root) %{_bindir}/mysqlxtest %attr(755, root, root) %{_bindir}/mysql_keyring_encryption_test +%attr(755, root, root) %{_libdir}/mysql/plugin/libtest_sql_sleep_is_connected.so +%attr(755, root, root) %{_libdir}/mysql/plugin/test_udf_wrappers.so %attr(755, root, root) %{_libdir}/mysql/plugin/auth.so %attr(755, root, root) %{_libdir}/mysql/plugin/auth_test_plugin.so %attr(755, root, root) %{_libdir}/mysql/plugin/component_example_component1.so @@ -1146,6 +1235,11 @@ fi %attr(755, root, root) %{_libdir}/mysql/plugin/debug/test_udf_services.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/udf_example.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/component_mysqlx_global_reset.so +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/binlog_utils_udf.so +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/component_query_attributes.so +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/component_reference_cache.so +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/libtest_sql_sleep_is_connected.so +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/test_udf_wrappers.so %if 0%{?tokudb} %files -n greatsql-tokudb @@ -1203,12 +1297,24 @@ fi %{_libdir}/mysqlrouter/*.so %dir %attr(755, mysqlrouter, mysqlrouter) /var/log/mysqlrouter %dir %attr(755, mysqlrouter, mysqlrouter) /var/run/mysqlrouter +%attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysqlrouter %files -n greatsql-mysql-config %config(noreplace) %{_sysconfdir}/my.cnf %dir %{_sysconfdir}/my.cnf.d +%files -n greatsql-icu-data-files +%defattr(-, root, root, -) +%doc %{?license_files_server} +%dir %attr(755, root, root) %{_libdir}/mysql/private/icudt69l +%{_libdir}/mysql/private/icudt69l/unames.icu +%{_libdir}/mysql/private/icudt69l/brkitr + + %changelog +* Wed Jun 7 2023 GreatSQL - 8.0.32-24.1 +- Release GreatSQL-8.0.32-24.1 for openEuler + * Mon Feb 6 2023 GreatSQL - 8.0.25-16.6 - compat-openssl11-devel diff --git a/mysql-5.7-sharedlib-rename.patch b/mysql-5.7-sharedlib-rename.patch index 0c33fd58a3023a6f76de09c0654f5ed0ffda256d..a6c2978e6b1eb65d2e2986b8228851b5e4ca24ce 100644 --- a/mysql-5.7-sharedlib-rename.patch +++ b/mysql-5.7-sharedlib-rename.patch @@ -1,17 +1,17 @@ --- client/base/CMakeLists.txt 2018-08-18 03:29:34.986169793 -0400 +++ client/base/CMakeLists.txt 2018-08-18 03:29:34.991586542 -0400 -@@ -46,4 +46,4 @@ - ${CMAKE_SOURCE_DIR}/sql-common/sql_string.cc +@@ -51,4 +51,4 @@ + ${CMAKE_SOURCE_DIR}/client/multi_factor_passwordopt-vars.cc ) -TARGET_LINK_LIBRARIES(client_base perconaserverclient) +TARGET_LINK_LIBRARIES(client_base mysqlclient) --- client/CMakeLists.txt 2018-08-18 03:29:59.708213642 -0400 +++ client/CMakeLists.txt 2018-08-18 03:29:59.712547041 -0400 -@@ -40,13 +40,13 @@ MYSQL_ADD_EXECUTABLE(mysql - pattern_matcher.cc - readline.cc - client_query_attributes.cc +@@ -49,13 +49,13 @@ MYSQL_ADD_EXECUTABLE(mysql + mysql_dump_encrypt.cc + multi_factor_passwordopt-vars.cc + ${CMAKE_CURRENT_SOURCE_DIR}/common/user_registration.cc - LINK_LIBRARIES perconaserverclient client_base ${MY_READLINE_LIBRARY} + LINK_LIBRARIES mysqlclient client_base ${MY_READLINE_LIBRARY} ) @@ -24,37 +24,51 @@ ) ENDIF() -@@ -72,24 +72,24 @@ MYSQL_ADD_EXECUTABLE(mysqltest +@@ -73,7 +73,7 @@ MYSQL_ADD_EXECUTABLE(mysqltest COMPONENT Test DEPENDENCIES GenError GenClientError ENABLE_EXPORTS - LINK_LIBRARIES perconaserverclient + LINK_LIBRARIES mysqlclient ) - MYSQL_ADD_EXECUTABLE(mysqlcheck + IF (WITH_COREDUMPER) + TARGET_LINK_LIBRARIES(mysqltest coredumper) +@@ -83,29 +83,29 @@ MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc check/mysqlcheck_core.cc + multi_factor_passwordopt-vars.cc - LINK_LIBRARIES perconaserverclient + LINK_LIBRARIES mysqlclient ) MYSQL_ADD_EXECUTABLE(mysqldump mysqldump.cc + mysql_dump_encrypt.cc + multi_factor_passwordopt-vars.cc +- LINK_LIBRARIES perconaserverclient ++ LINK_LIBRARIES mysqlclient + ) + MYSQL_ADD_EXECUTABLE(mysqldecrypt + ../sql/encrypt.cc + path.cc + mysqldecrypt.cc - LINK_LIBRARIES perconaserverclient + LINK_LIBRARIES mysqlclient ) MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.cc + multi_factor_passwordopt-vars.cc - LINK_LIBRARIES perconaserverclient + LINK_LIBRARIES mysqlclient ) MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.cc + multi_factor_passwordopt-vars.cc - LINK_LIBRARIES perconaserverclient + LINK_LIBRARIES mysqlclient ) OPTION(WITH_JSON_BINLOG_LIBRARY -@@ -221,7 +221,7 @@ SET(MYSQLBINLOG_SOURCES +@@ -249,7 +249,7 @@ SET(MYSQLBINLOG_SOURCES SET(MYSQLBINLOG_LIBRARIES binlogevents_static client_base @@ -63,15 +77,16 @@ ) IF(WITH_JSON_BINLOG_LIBRARY) -@@ -254,19 +254,19 @@ TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE_SOURCE_DIR}/sql) - +@@ -291,20 +291,20 @@ TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE_SOURCE_DIR}/sql) MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc + multi_factor_passwordopt-vars.cc - LINK_LIBRARIES perconaserverclient + LINK_LIBRARIES mysqlclient ) MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.cc + multi_factor_passwordopt-vars.cc - LINK_LIBRARIES perconaserverclient + LINK_LIBRARIES mysqlclient ) @@ -98,24 +113,24 @@ client_base ${SSL_LIBRARIES} ) ---- include/mysql.h 2018-08-18 03:30:11.721480261 -0400 -+++ include/mysql.h 2018-08-18 03:30:11.727980360 -0400 +--- include/mysql.h 2022-09-13 10:19:20.000000000 +0300 ++++ include/mysql.h 2022-09-13 12:40:29.000000000 +0300 @@ -28,7 +28,7 @@ /** @file include/mysql.h This file defines the client API to MySQL and also the ABI of the - dynamically linked libperconaserverclient. + dynamically linked libmysqlclient. - + The ABI should never be changed in a released product of MySQL, thus you need to take great care when changing the file. In case -@@ -399,12 +399,12 @@ - +@@ -410,12 +410,12 @@ + /* mysql_server_init/end need to be called when using libmysqld or - libperconaserverclient (exactly, mysql_server_init() is called by + libmysqlclient (exactly, mysql_server_init() is called by - mysql_init() so you don't need to call it explicitely; but you need to call + mysql_init() so you don't need to call it explicitly; but you need to call mysql_server_end() to free memory). The names are a bit misleading (mysql_SERVER* to be used when using libmysqlCLIENT). So we add more general names which suit well whether you're using libmysqld or @@ -124,18 +139,19 @@ mysql_server* ones. */ #define mysql_library_init mysql_server_init ---- libmysql/CMakeLists.txt 2018-08-18 03:30:19.520515918 -0400 -+++ libmysql/CMakeLists.txt 2018-08-18 03:30:19.525932667 -0400 -@@ -273,13 +273,13 @@ ENDIF() - # LDAP authentication SASL client plugin - ADD_SUBDIRECTORY(authentication_ldap) +--- libmysql/CMakeLists.txt ++++ libmysql/CMakeLists.txt +@@ -283,15 +283,15 @@ + # authentication IAM client plug-in + ADD_SUBDIRECTORY(authentication_oci_client) -# Merge several convenience libraries into one big perconaserverclient --MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS_TO_MERGE} COMPONENT Development) --TARGET_LINK_LIBRARIES(perconaserverclient PRIVATE ${LIBS_TO_LINK}) +-MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS_TO_MERGE} +# Merge several convenience libraries into one big mysqlclient -+MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development) -+TARGET_LINK_LIBRARIES(mysqlclient PRIVATE ${LIBS_TO_LINK}) ++MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} + COMPONENT Development + LINK_LIBRARIES ${LIBS_TO_LINK} + ) # Visual Studio users need debug static library for debug projects IF(MSVC) @@ -144,8 +160,16 @@ INSTALL_DEBUG_TARGET(auth_win_client DESTINATION ${INSTALL_LIBDIR}/debug) INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug) -@@ -308,7 +308,7 @@ IF(UNIX) - ENDMACRO() +@@ -326,13 +326,13 @@ + STRING_APPEND(OS_SHARED_LIB_VERSION + ".${SHARED_LIB_MINOR_VERSION}.${SHARED_LIB_PATCH_VERSION}") + ENDIF() +- # Name of shared library is libperconaserverclient on Unix +- SET(UNIX_OUTPUT_NAME OUTPUT_NAME perconaserverclient) ++ # Name of shared library is libmysqlclient on Unix ++ SET(UNIX_OUTPUT_NAME OUTPUT_NAME mysqlclient) + SET(UNIX_VERSION VERSION "${OS_SHARED_LIB_VERSION}") + SET(UNIX_SOVERSION SOVERSION "${SHARED_LIB_MAJOR_VERSION}") ENDIF() -# Merge several convenience libraries into one big perconaserverclient @@ -153,41 +177,100 @@ # and link them together into shared library. MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE} EXPORTS -@@ -340,9 +340,9 @@ IF(UNIX) - SET(OS_SHARED_LIB_VERSION - "${SHARED_LIB_MAJOR_VERSION}.${SHARED_LIB_MINOR_VERSION}.${SHARED_LIB_PATCH_VERSION}") +@@ -353,7 +353,7 @@ + + IF(LINUX_STANDALONE AND KERBEROS_CUSTOM_LIBRARY) + ADD_DEPENDENCIES(libmysql ${kerberos_target}) +- ADD_DEPENDENCIES(perconaserverclient ${kerberos_target}) ++ ADD_DEPENDENCIES(mysqlclient ${kerberos_target}) + ENDIF() + + IF(UNIX) +@@ -368,8 +368,8 @@ ENDIF() -- # Name of shared library is perconaserverclient on Unix -+ # Name of shared library is mysqlclient on Unix - SET_TARGET_PROPERTIES(libmysql PROPERTIES -- OUTPUT_NAME perconaserverclient -+ OUTPUT_NAME mysqlclient - VERSION "${OS_SHARED_LIB_VERSION}" - SOVERSION "${SHARED_LIB_MAJOR_VERSION}") - CONFIGURE_FILE(libmysql.ver.in ${CMAKE_CURRENT_BINARY_DIR}/libmysql.ver) -@@ -364,8 +364,8 @@ IF(UNIX) - "LINKER:--version-script=${CMAKE_CURRENT_BINARY_DIR}/libmysql.ver") - ENDIF() + # clean direct output needs to be set several targets have the same name - #(perconaserverclient in this case) - SET_TARGET_PROPERTIES(perconaserverclient PROPERTIES CLEAN_DIRECT_OUTPUT 1) + #(mysqlclient in this case) + SET_TARGET_PROPERTIES(mysqlclient PROPERTIES CLEAN_DIRECT_OUTPUT 1) SET_TARGET_PROPERTIES(libmysql PROPERTIES CLEAN_DIRECT_OUTPUT 1) - ENDIF() ---- scripts/CMakeLists.txt 2018-08-18 03:31:39.003728628 -0400 -+++ scripts/CMakeLists.txt 2018-08-18 03:31:39.009145377 -0400 -@@ -365,7 +365,7 @@ + +--- libmysql/libmysql.ver.in ++++ libmysql/libmysql.ver.in +@@ -21,5 +21,5 @@ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + + +-libperconaserverclient_@SHARED_LIB_MAJOR_VERSION@.0 ++libmysqlclient_@SHARED_LIB_MAJOR_VERSION@.0 + { global: ${CLIENT_API_FUNCTIONS};${CLIENT_API_FUNCTIONS_UNDOCUMENTED}; ${CLIENT_API_NONBLOCKING_FUNCTIONS}; local: *; }; +--- plugin/percona-pam-for-mysql/CMakeLists.txt ++++ plugin/percona-pam-for-mysql/CMakeLists.txt +@@ -36,7 +36,7 @@ IF(HAVE_PAM AND HAVE_GETPWNAM_R AND HAVE_GETGRGID_R AND HAVE_DLFCN_H) + MYSQL_ADD_PLUGIN(dialog + src/dialog.cc + ../../sql-common/get_password.cc +- LINK_LIBRARIES perconaserverclient ++ LINK_LIBRARIES mysqlclient + MODULE_ONLY) + + IF(UNIX) +--- plugin/x/tests/driver/CMakeLists.txt ++++ plugin/x/tests/driver/CMakeLists.txt +@@ -42,7 +42,7 @@ MYSQL_ADD_EXECUTABLE(mysqlxtest + LINK_LIBRARIES + mysys + strings +- perconaserverclient ++ mysqlclient + ${MYSQLX_CLIENT_FULL_LIB} + ${MYSQLX_PROTOCOL_FULL_LIB} + ${PROTOBUF_LIBRARY} +--- router/src/router/src/CMakeLists.txt ++++ router/src/router/src/CMakeLists.txt +@@ -71,7 +71,7 @@ TARGET_LINK_LIBRARIES(router_lib + ${CMAKE_DL_LIBS} + harness-library + harness_stdx +- perconaserverclient ++ mysqlclient + ${SSL_LIBRARIES} + io_component + ) +--- router/tests/fuzzers/CMakeLists.txt ++++ router/tests/fuzzers/CMakeLists.txt +@@ -34,7 +34,7 @@ IF(LIBFUZZER_COMPILE_FLAGS) + + LINK_LIBRARIES + harness-library +- perconaserverclient ++ mysqlclient + ${SSL_LIBRARIES} + + RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +@@ -62,7 +62,7 @@ IF(LIBFUZZER_COMPILE_FLAGS) + + LINK_LIBRARIES + harness-library +- perconaserverclient ++ mysqlclient + ${SSL_LIBRARIES} + + RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +--- scripts/CMakeLists.txt ++++ scripts/CMakeLists.txt +@@ -302,7 +302,7 @@ ELSE() ENDIF() - # Use cmake variables to inspect dependencies for + # Use cmake variables to inspect dependencies for -# perconaserverclient library (add -l stuff) +# mysqlclient library (add -l stuff) SET(CLIENT_LIBS "") SET(LIBS "") -@@ -398,11 +398,11 @@ +@@ -337,11 +337,11 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) STRING(REGEX REPLACE "[ ]+$" "" ${var} "${${var}}") ENDMACRO() @@ -202,163 +285,9 @@ ELSE() GET_TARGET_PROPERTY(LIBMYSQL_OS_SHLIB_VERSION libmysql VERSION) GET_TARGET_PROPERTY(LIBMYSQL_OS_OUTPUT_NAME libmysql OUTPUT_NAME) ---- storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile 2018-08-18 03:31:53.867288716 -0400 -+++ storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile 2018-08-18 03:31:53.870538766 -0400 -@@ -36,7 +36,7 @@ - SYS_LIB = - - $(TARGET): $(OBJS) -- $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) -+ $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) - - $(OBJS): $(SRCS) - $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/mgmapi -I$(INCLUDE_DIR)/ndbapi $(SRCS) ---- storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile 2018-08-18 03:32:01.879744295 -0400 -+++ storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile 2018-08-18 03:32:01.884077695 -0400 -@@ -36,7 +36,7 @@ - SYS_LIB = - - $(TARGET): $(OBJS) -- $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) -+ $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) - - $(OBJS): $(SRCS) - $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/mgmapi -I$(INCLUDE_DIR)/ndbapi $(SRCS) ---- storage/ndb/ndbapi-examples/ndbapi_async/Makefile 2018-08-18 03:32:11.933231001 -0400 -+++ storage/ndb/ndbapi-examples/ndbapi_async/Makefile 2018-08-18 03:32:11.936481050 -0400 -@@ -36,7 +36,7 @@ - SYS_LIB = - - $(TARGET): $(OBJS) -- $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) -+ $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) - - $(TARGET).o: $(SRCS) - $(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS) ---- storage/ndb/ndbapi-examples/ndbapi_async1/Makefile 2018-08-18 03:32:17.497315889 -0400 -+++ storage/ndb/ndbapi-examples/ndbapi_async1/Makefile 2018-08-18 03:32:17.501649289 -0400 -@@ -35,7 +35,7 @@ - SYS_LIB = - - $(TARGET): $(OBJS) -- $(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) -+ $(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) - - $(TARGET).o: $(SRCS) - $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS) ---- storage/ndb/ndbapi-examples/ndbapi_blob/Makefile 2018-08-18 03:32:25.159849464 -0400 -+++ storage/ndb/ndbapi-examples/ndbapi_blob/Makefile 2018-08-18 03:32:25.163099513 -0400 -@@ -36,7 +36,7 @@ - SYS_LIB = - - $(TARGET): $(OBJS) -- $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) -+ $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) - - $(TARGET).o: $(SRCS) - $(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS) ---- storage/ndb/ndbapi-examples/ndbapi_blob_ndbrecord/Makefile 2018-08-18 03:32:34.693328250 -0400 -+++ storage/ndb/ndbapi-examples/ndbapi_blob_ndbrecord/Makefile 2018-08-18 03:32:34.697661649 -0400 -@@ -36,7 +36,7 @@ - SYS_LIB = - - $(TARGET): $(OBJS) -- $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) -+ $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) - - $(OBJS): $(SRCS) - $(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS) ---- storage/ndb/ndbapi-examples/ndbapi_event/Makefile 2018-08-18 03:32:39.731988459 -0400 -+++ storage/ndb/ndbapi-examples/ndbapi_event/Makefile 2018-08-18 03:32:39.736321858 -0400 -@@ -36,7 +36,7 @@ - SYS_LIB = - - $(TARGET): $(OBJS) -- $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) -+ $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) - - $(TARGET).o: $(SRCS) Makefile - $(CXX) $(CFLAGS) $(DEBUG) -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi -I$(TOP_SRCDIR)/include $(SRCS) ---- storage/ndb/ndbapi-examples/ndbapi_recattr_vs_record/Makefile 2018-08-18 03:32:51.553502151 -0400 -+++ storage/ndb/ndbapi-examples/ndbapi_recattr_vs_record/Makefile 2018-08-18 03:32:51.558918901 -0400 -@@ -36,7 +36,7 @@ - SYS_LIB = - - $(TARGET): $(OBJS) -- $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) -+ $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) - - $(OBJS): $(SRCS) - $(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS) ---- storage/ndb/ndbapi-examples/ndbapi_retries/Makefile 2018-08-18 03:33:03.477934084 -0400 -+++ storage/ndb/ndbapi-examples/ndbapi_retries/Makefile 2018-08-18 03:33:03.483350833 -0400 -@@ -35,7 +35,7 @@ - SYS_LIB = - - $(TARGET): $(OBJS) -- $(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) -+ $(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) - - $(TARGET).o: $(SRCS) - $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS) ---- storage/ndb/ndbapi-examples/ndbapi_scan/Makefile 2018-08-18 03:33:11.319220386 -0400 -+++ storage/ndb/ndbapi-examples/ndbapi_scan/Makefile 2018-08-18 03:33:11.322470436 -0400 -@@ -36,7 +36,7 @@ - SYS_LIB = - - $(TARGET): $(OBJS) -- $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) -+ $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) - - $(TARGET).o: $(SRCS) - $(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS) ---- storage/ndb/ndbapi-examples/ndbapi_simple/Makefile 2018-08-18 03:33:20.103021067 -0400 -+++ storage/ndb/ndbapi-examples/ndbapi_simple/Makefile 2018-08-18 03:33:20.107354466 -0400 -@@ -36,7 +36,7 @@ - SYS_LIB = - - $(TARGET): $(OBJS) -- $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) -+ $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) - - $(TARGET).o: $(SRCS) - $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS) ---- storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile 2018-08-18 03:33:28.880321646 -0400 -+++ storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile 2018-08-18 03:33:28.884655046 -0400 -@@ -36,7 +36,7 @@ - SYS_LIB = - - $(TARGET): $(OBJS) -- $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) -+ $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) - - $(OBJS): $(SRCS) - $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS) ---- storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile 2018-08-18 03:33:37.747540266 -0400 -+++ storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile 2018-08-18 03:33:37.752957016 -0400 -@@ -36,7 +36,7 @@ - SYS_LIB = - - $(TARGET): $(OBJS) -- $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) -+ $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) - - $(OBJS): $(SRCS) - $(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS) ---- storage/ndb/ndbapi-examples/ndbapi_s_i_ndbrecord/Makefile 2018-08-18 03:33:46.284337179 -0400 -+++ storage/ndb/ndbapi-examples/ndbapi_s_i_ndbrecord/Makefile 2018-08-18 03:33:46.289753929 -0400 -@@ -36,7 +36,7 @@ - SYS_LIB = - - $(TARGET): $(OBJS) -- $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) -+ $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) - - $(OBJS): $(SRCS) - $(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS) ---- storage/ndb/test/run-test/CMakeLists.txt 2018-08-18 03:33:54.833050942 -0400 -+++ storage/ndb/test/run-test/CMakeLists.txt 2018-08-18 03:33:54.837384341 -0400 -@@ -46,7 +46,7 @@ +--- storage/ndb/test/run-test/CMakeLists.txt ++++ storage/ndb/test/run-test/CMakeLists.txt +@@ -47,7 +47,7 @@ test_execution_resources.cpp DESTINATION mysql-test/ndb ENABLE_EXPORTS @@ -366,9 +295,24 @@ + LINK_LIBRARIES ndbNDBT ndbclient_static mysqlclient ) - FILE(GLOB testcase_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*-tests.txt") ---- testclients/CMakeLists.txt 2018-08-18 03:34:01.038478951 -0400 -+++ testclients/CMakeLists.txt 2018-08-18 03:34:01.042812350 -0400 + IF(MY_COMPILER_IS_CLANG) +--- storage/ndb/tools/CMakeLists.txt ++++ storage/ndb/tools/CMakeLists.txt +@@ -230,10 +230,10 @@ IF(NOT WIN32 AND NOT SOLARIS) + COMPONENT ClusterTools + ) + IF(NCURSES_HAS_STDSCR) +- TARGET_LINK_LIBRARIES(ndb_top perconaserverclient ${NCURSESW_LIB}) ++ TARGET_LINK_LIBRARIES(ndb_top mysqlclient ${NCURSESW_LIB}) + ELSE() + TARGET_LINK_LIBRARIES(ndb_top +- perconaserverclient ++ mysqlclient + ${NCURSESW_LIB} + ${NCURSES_TINFO_LIB}) + ENDIF() +--- testclients/CMakeLists.txt ++++ testclients/CMakeLists.txt @@ -23,9 +23,9 @@ ADD_WSHADOW_WARNING() @@ -381,98 +325,109 @@ - TARGET_LINK_LIBRARIES(bug25714 perconaserverclient) + TARGET_LINK_LIBRARIES(bug25714 mysqlclient) ENDIF() ---- plugin/percona-pam-for-mysql/CMakeLists.txt 2018-08-21 07:01:38.155232659 -0400 -+++ plugin/percona-pam-for-mysql/CMakeLists.txt 2018-08-21 07:02:18.194400527 -0400 -@@ -36,7 +36,7 @@ - MYSQL_ADD_PLUGIN(dialog - src/dialog.cc - ../../sql-common/get_password.cc -- LINK_LIBRARIES perconaserverclient -+ LINK_LIBRARIES mysqlclient - MODULE_ONLY) - - IF(UNIX) ---- unittest/gunit/group_replication/CMakeLists.txt 2018-08-22 01:55:48.775894920 -0400 -+++ unittest/gunit/group_replication/CMakeLists.txt 2018-08-22 01:56:19.804229110 -0400 -@@ -40,7 +40,7 @@ - LINK_LIBRARIES +--- unittest/gunit/group_replication/CMakeLists.txt ++++ unittest/gunit/group_replication/CMakeLists.txt +@@ -47,7 +47,7 @@ gr_unit_test_resource - gunit_small + gunit_large + server_unittest_library - perconaserverclient + mysqlclient mysqlgcs ) ENDFOREACH() ---- plugin/x/tests/driver/CMakeLists.txt 2018-08-22 03:58:32.371339263 -0400 -+++ plugin/x/tests/driver/CMakeLists.txt 2018-08-22 03:58:46.195045928 -0400 -@@ -79,7 +79,7 @@ - LINK_LIBRARIES - mysys - strings -- perconaserverclient -+ mysqlclient - ${MYSQLX_CLIENT_FULL_LIB} +--- unittest/gunit/xplugin/xcl/CMakeLists.txt ++++ unittest/gunit/xplugin/xcl/CMakeLists.txt +@@ -77,7 +77,7 @@ TARGET_LINK_LIBRARIES(${XCL_UNIT_TESTS} ${MYSQLX_PROTOCOL_FULL_LIB} ${PROTOBUF_LIBRARY} ---- router/src/metadata_cache/CMakeLists.txt 2019-12-04 10:04:41.972129557 +0200 -+++ router/src/metadata_cache/CMakeLists.txt 2019-12-04 10:06:40.135965582 +0200 -@@ -67,7 +67,7 @@ - ADD_LIBRARY(metadata_cache_static STATIC ${METADATA_CACHE_SOURCES}) - TARGET_LINK_LIBRARIES(metadata_cache_static - router_lib -- perconaserverclient -+ mysqlclient - mysqlxmessages_lite - ${PROTOBUF_LITE_LIBRARY} - ) ---- router/src/metadata_cache/tests/CMakeLists.txt 2019-12-04 10:04:41.972129557 +0200 -+++ router/src/metadata_cache/tests/CMakeLists.txt 2019-12-04 10:08:31.859600010 +0200 -@@ -55,7 +55,7 @@ - ADD_LIBRARY(metadata_cache_tests SHARED ${METADATA_CACHE_TESTS_HELPER}) - TARGET_LINK_LIBRARIES(metadata_cache_tests - router_lib -- perconaserverclient -+ mysqlclient - mysqlxclient_lite - mysqlxmessages_lite - ${PROTOBUF_LITE_LIBRARY} + ${LZ4_LIBRARY} +- perconaserverclient ++ mysqlclient + gtest + gmock + ) +--- unittest/gunit/xplugin/xpl/CMakeLists.txt ++++ unittest/gunit/xplugin/xpl/CMakeLists.txt +@@ -115,7 +115,7 @@ TARGET_LINK_LIBRARIES(${XPL_UNIT_TESTS} + ${GCOV_LDFLAGS} + ${MYSQLX_CLIENT_LIB} + mysqlx +- perconaserverclient ++ mysqlclient + gtest + gmock + ) +#--- storage/tokudb/PerconaFT/tools/CMakeLists.txt 2018-08-29 12:23:52.000000000 -0400 +#+++ storage/tokudb/PerconaFT/tools/CMakeLists.txt 2018-08-29 12:41:38.711986474 -0400 +#@@ -20,7 +20,7 @@ +# target_link_libraries(${tool} sql binlog rpl master slave) +# endif () +# else () +#- target_link_libraries(${tool} perconaserverclient) +#+ target_link_libraries(${tool} mysqlclient) +# endif () +# endif () + +--- libmysql/authentication_kerberos/CMakeLists.txt 2021-09-28 04:49:14.000000000 +0000 ++++ libmysql/authentication_kerberos/CMakeLists.txt 2021-09-28 09:24:09.917822028 +0000 @@ -65,7 +65,7 @@ - TARGET_LINK_LIBRARIES(metadata_cache_tests - router_lib - metadata_cache -- perconaserverclient -+ mysqlclient - mysqlxclient_lite - mysqlxmessages_lite - ${PROTOBUF_LITE_LIBRARY} ---- router/src/router/src/CMakeLists.txt 2019-12-04 10:04:41.980129555 +0200 -+++ router/src/router/src/CMakeLists.txt 2019-12-04 10:10:55.818892238 +0200 -@@ -71,7 +71,7 @@ TARGET_LINK_LIBRARIES(router_lib - ${CMAKE_DL_LIBS} - harness-library - harness_stdx + LIST(APPEND UTILITY "sspi_utility.cc") + ENDIF() + +-SET(MY_SQL "perconaserverclient") ++SET(MY_SQL "mysqlclient") + + DISABLE_MISSING_PROFILE_WARNING() + +--- unittest/gunit/changestreams/CMakeLists.txt 2022-03-31 15:09:27.559009464 +0000 ++++ unittest/gunit/changestreams/CMakeLists.txt 2022-03-31 15:10:26.404854666 +0000 +@@ -36,7 +36,7 @@ + SET(TESTS_LINK_LIBRARIES + changestreams_standalone_static + binlogstandalone_static - perconaserverclient + mysqlclient - ${SSL_LIBRARIES} - io_component - ) ---- router/tests/fuzzers/CMakeLists.txt 2019-12-04 10:04:41.996129551 +0200 -+++ router/tests/fuzzers/CMakeLists.txt 2019-12-04 10:11:53.090550318 +0200 -@@ -32,7 +32,7 @@ - - LINK_LIBRARIES - harness-library -- perconaserverclient -+ mysqlclient - ${SSL_LIBRARIES} - - RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -@@ -59,7 +59,7 @@ - - LINK_LIBRARIES - harness-library -- perconaserverclient -+ mysqlclient - ${SSL_LIBRARIES} - - RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + gunit_small) + + IF (WITH_CS_PROTOBUF) + +--- router/src/router/tests/CMakeLists.txt 2022-07-26 08:37:14.834824576 +0000 ++++ router/src/router/tests/CMakeLists.txt 2022-07-26 08:38:26.484931770 +0000 +@@ -130,7 +130,7 @@ + ADD_HARNESS_TEST_FILE(test_mysql_session.cc + MODULE ${TEST_MODULE} + LIB_DEPENDS +- test-helpers perconaserverclient ++ test-helpers mysqlclient + EXTRA_SOURCES + ../src/common/mysql_session.cc + ../src/common/log_filter.cc +@@ -146,7 +146,7 @@ + ADD_HARNESS_TEST_FILE(test_metadata_check.cc + MODULE ${TEST_MODULE} + LIB_DEPENDS +- test-helpers perconaserverclient ++ test-helpers mysqlclient + EXTRA_SOURCES + ../src/common/mysql_session.cc + ../src/common/log_filter.cc +@@ -168,7 +168,7 @@ + ADD_HARNESS_TEST_FILE(test_cluster_metadata.cc + MODULE ${TEST_MODULE} + LIB_DEPENDS +- test-helpers perconaserverclient ++ test-helpers mysqlclient + EXTRA_SOURCES + ../src/common/mysql_session.cc + ../src/common/log_filter.cc +@@ -190,7 +190,7 @@ + ADD_HARNESS_TEST_FILE(test_windows_service.cc + MODULE ${TEST_MODULE} + LIB_DEPENDS +- test-helpers perconaserverclient ++ test-helpers mysqlclient + EXTRA_SOURCES + ../src/windows/main-windows.cc + ../src/windows/nt_servc.cc +