Date: Tuesday, March 17, 2020 @ 13:19:18 Author: mtorromeo Revision: 600161
archrelease: copy trunk to community-x86_64 Added: percona-server/repos/community-x86_64/PKGBUILD (from rev 600160, percona-server/trunk/PKGBUILD) percona-server/repos/community-x86_64/build-hostname.patch (from rev 600160, percona-server/trunk/build-hostname.patch) percona-server/repos/community-x86_64/my.cnf (from rev 600160, percona-server/trunk/my.cnf) percona-server/repos/community-x86_64/mysql-user.conf (from rev 600160, percona-server/trunk/mysql-user.conf) percona-server/repos/community-x86_64/no-werror.patch (from rev 600160, percona-server/trunk/no-werror.patch) percona-server/repos/community-x86_64/rocksdb-make.patch (from rev 600160, percona-server/trunk/rocksdb-make.patch) percona-server/repos/community-x86_64/rocksdb-systemlibs.patch (from rev 600160, percona-server/trunk/rocksdb-systemlibs.patch) Deleted: percona-server/repos/community-x86_64/PKGBUILD percona-server/repos/community-x86_64/build-hostname.patch percona-server/repos/community-x86_64/my.cnf percona-server/repos/community-x86_64/mysql-user.conf percona-server/repos/community-x86_64/no-werror.patch percona-server/repos/community-x86_64/rocksdb-make.patch percona-server/repos/community-x86_64/rocksdb-systemlibs.patch --------------------------+ PKGBUILD | 366 ++++++++++++++++++++++----------------------- build-hostname.patch | 34 ++-- my.cnf | 68 ++++---- mysql-user.conf | 2 no-werror.patch | 56 +++--- rocksdb-make.patch | 26 +-- rocksdb-systemlibs.patch | 104 ++++++------ 7 files changed, 329 insertions(+), 327 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-03-17 13:18:44 UTC (rev 600160) +++ PKGBUILD 2020-03-17 13:19:18 UTC (rev 600161) @@ -1,182 +0,0 @@ -# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> - -pkgbase=percona-server -pkgname=('libperconaserverclient' 'percona-server-clients' 'percona-server') -pkgver=8.0.18_9 -_boost_ver=1.70.0 -_pkgver=${pkgver/_/-} -_myver=${pkgver/_rel*} -pkgrel=2 -arch=('x86_64') -makedepends=('cmake' 'zlib' 'lz4' 'zstd' 'libaio' 'systemd-tools' 'pam' 'numactl' 'jemalloc' 'openssl' 'rpcsvc-proto' 'boost' 'doxygen' 'graphviz') -license=('GPL') -url="https://www.percona.com/software/mysql-database/percona-server" -source=("https://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-$_pkgver/source/tarball/percona-server-$_pkgver.tar.gz" - "https://dl.bintray.com/boostorg/release/$_boost_ver/source/boost_${_boost_ver//./_}.tar.gz" - 'my.cnf' - 'mysql-user.conf' - 'build-hostname.patch' - 'no-werror.patch' - 'rocksdb-systemlibs.patch' - 'rocksdb-make.patch') -sha256sums=('31b980b0f87a8d261f5bdfd353e05dc92b261997a94c3df604d7ed2526fdc2d7' - '882b48708d211a5f48e60b0124cf5863c1534cd544ecd0664bb534a4b5d506e9' - 'b467b04d6d06152b2abc33f2a6de63fef0fc922dd5119d2ee1d07d3c1a489731' - 'e638a2657085f15b6728f43c1fd6aa551b27608fbf6b435e33afd3606a0cfb0e' - '1537fdbb92dd1c135c1eb9f4d10c44fd02e652db66c933d731990a1196f1397c' - 'fe1cb2b079c56ff0f827c7dfb25d004b2190410406820c490dc6152cfe392b70' - '1bbae30fe4c7d8198aaa771a20ca2fbeb6494de9ec4e516e4bab5f1387b3b8bd' - '2ff495d271f99c4d0dba89e8ccde7e6b9789a4ea6b55034de9b9217b47e32c03') - -prepare() { - cd $pkgbase-$_pkgver - rm -v sql/sql_yacc.{cc,h} - - patch -p1 -i "$srcdir"/build-hostname.patch - patch -p1 -i "$srcdir"/no-werror.patch - patch -p1 -i "$srcdir"/rocksdb-systemlibs.patch - patch -p1 -i "$srcdir"/rocksdb-make.patch - - echo StateDirectory=mysql mysql-files >> scripts/systemd/mysqld.service.in - echo StateDirectory=mysql mysql-files >> scripts/systemd/mys...@.service.in -} - -build() { - # rm -rf build - mkdir -p build - cd build - - cmake ../$pkgbase-$_pkgver \ - -Wno-dev \ - -DBUILD_CONFIG=mysql_release \ - -DREPRODUCIBLE_BUILD=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DSYSCONFDIR=/etc/mysql \ - -DMYSQL_DATADIR=/var/lib/mysql \ - -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \ - -DDEFAULT_CHARSET=utf8mb4 \ - -DDEFAULT_COLLATION=utf8mb4_general_ci \ - -DENABLED_LOCAL_INFILE=ON \ - -DINSTALL_INFODIR=share/doc/percona-server \ - -DINSTALL_DOCREADMEDIR=share/doc/percona-server \ - -DINSTALL_DOCDIR=share/doc/percona-server \ - -DINSTALL_MANDIR=share/man \ - -DINSTALL_PLUGINDIR=lib/perconaserver/plugin \ - -DINSTALL_SCRIPTDIR=bin \ - -DINSTALL_INCLUDEDIR=include/perconaserver \ - -DINSTALL_SUPPORTFILESDIR=share/mysql \ - -DINSTALL_MYSQLSHAREDIR=share/mysql \ - -DINSTALL_STATIC_LIBRARIES=OFF \ - -DWITH_ZLIB=system \ - -DWITH_LZ4=system \ - -DWITH_SSL=system \ - -DWITH_LIBWRAP=OFF \ - -DWITH_MECAB=OFF \ - -DWITH_PAM=ON \ - -DWITH_EMBEDDED_SERVER=ON \ - -DWITH_EMBEDDED_SHARED_LIBRARY=ON \ - -DWITH_INNODB_MEMCACHED=ON \ - -DWITH_ARCHIVE_STORAGE_ENGINE=ON \ - -DWITH_BLACKHOLE_STORAGE_ENGINE=ON \ - -DWITH_FEDERATED_STORAGE_ENGINE=ON \ - -DWITH_ROCKSDB=ON \ - -DTOKU_DEBUG_PARANOID=OFF \ - -DWITH_VALGRIND=OFF \ - -DUSE_VALGRIND=OFF \ - -DDEBUG_EXTNAME=OFF \ - -DBUILD_TESTING=OFF \ - -DWITH_UNIT_TESTS=OFF \ - -DUSE_GTAGS=OFF \ - -DUSE_CTAGS=OFF \ - -DUSE_ETAGS=OFF \ - -DUSE_CSCOPE=OFF \ - -DTOKUDB_BACKUP_PLUGIN_VERSION=$_pkgver \ - -DWITH_SYSTEMD=1 \ - -DWITH_SCALABILITY_METRICS=ON \ - -DCMAKE_EXE_LINKER_FLAGS='-ljemalloc' \ - -DWITH_BOOST=system \ - -DWITH_NUMA=ON \ - -DWITH_BOOST="../boost_${_boost_ver//./_}" - - make -} - -package_libperconaserverclient() { - pkgdesc='Percona Server client libraries' - depends=('zlib' 'openssl') - - cd build - for dir in include libmysql libservices; do - make -C $dir DESTDIR="$pkgdir" install - done - - # Conflicting files with mariadb-libs - rm -rf "$pkgdir"/usr/lib/{libmysqld.so*,libmysqlclient{,_r}.so*,perconaserver} - - install -Dm755 scripts/mysql_config "$pkgdir"/usr/bin/perconaserver_config - install -Dm644 "$srcdir"/$pkgbase-$_pkgver/man/mysql_config.1 "$pkgdir"/usr/share/man/man1/perconaserver_config.1 - - install -D -m0644 scripts/perconaserverclient.pc "$pkgdir"/usr/lib/pkgconfig/perconaserverclient.pc - install -D -m0644 "$srcdir"/$pkgbase-$_pkgver/support-files/mysql.m4 "$pkgdir"/usr/share/aclocal/perconaserverclient.m4 -} - -package_percona-server-clients() { - pkgdesc='Percona Server client tools' - depends=('libperconaserverclient' 'zlib' 'lz4' 'jemalloc' 'readline') - conflicts=('mysql-clients') - provides=("mysql-clients=$_myver" "mariadb-clients=$_myver") - - cd build - make -C client DESTDIR="$pkgdir" install - - # install man pages - install -d "$pkgdir"/usr/share/man/man1 - for man in mysql{,admin,check,dump,import,show,slap,pump,binlog,_upgrade}; do - install -m644 "$srcdir"/$pkgbase-$_pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1 - done - - # provided by percona-server - rm "$pkgdir"/usr/bin/mysql{_config_editor,_secure_installation,_ssl_rsa_setup} -} - -package_percona-server() { - pkgdesc='Drop-in replacement for MySQL that provides improved performance, diagnostics, instrumentation and MyRocks storage engine' - backup=('etc/mysql/my.cnf') - depends=('libaio' 'systemd-tools' 'pam' 'jemalloc' 'numactl' 'lz4' 'zstd' 'openssl' 'libtirpc' 'curl' 'boost-libs') - optdepends=('perl-dbd-mysql') - conflicts=('mysql') - provides=("mysql=$_myver" "mariadb=$_myver") - options=('emptydirs') - - cd build - make DESTDIR="$pkgdir" install - - install -Dm644 ../my.cnf "$pkgdir"/etc/mysql/my.cnf - install -Dm644 ../mysql-user.conf "$pkgdir"/usr/lib/sysusers.d/mysql.conf - - cd "$pkgdir" - chmod 755 usr - mv usr/usr/lib/* usr/lib - rm -rf usr/{usr,data,run,lib/perconaserver/plugin/debug,lib/tmpfiles.d/mysql.conf} - - # Move documentation - if [ -f usr/PATENTS ]; then - mv usr/{PATENTS,README.md} usr/share/doc/$pkgname/ - rm usr/COPYING.* usr/{LICENSE,README}.router - fi - - # provided by libperconaserverclient - rm usr/bin/mysql_config - rm usr/lib/lib{mysql,perconaserver}* - rm -r usr/include/ - rm usr/share/man/man1/mysql_config.1 - rm -r usr/share/aclocal usr/lib/pkgconfig - - # provided by percona-server-clients - rm usr/bin/mysql{,admin,check,dump,import,show,slap,pump,binlog,test,_upgrade} - rm usr/share/man/man1/mysql{,admin,check,dump,import,show,slap,pump,binlog,_upgrade}.1 - - # not needed - rm -r usr/mysql-test - rm usr/share/doc/percona-server/{INFO_*,mysql.info,*-test} -} Copied: percona-server/repos/community-x86_64/PKGBUILD (from rev 600160, percona-server/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-03-17 13:19:18 UTC (rev 600161) @@ -0,0 +1,184 @@ +# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> + +pkgbase=percona-server +pkgname=('libperconaserverclient' 'percona-server-clients' 'percona-server') +pkgver=8.0.18_9 +_boost_ver=1.70.0 +_pkgver=${pkgver/_/-} +_myver=${pkgver/_rel*} +pkgrel=3 +arch=('x86_64') +makedepends=('cmake' 'zlib' 'lz4' 'zstd' 'libaio' 'systemd-tools' 'pam' 'numactl' 'jemalloc' 'openssl' 'rpcsvc-proto' 'boost' 'doxygen' 'graphviz') +license=('GPL') +url="https://www.percona.com/software/mysql-database/percona-server" +source=("https://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-$_pkgver/source/tarball/percona-server-$_pkgver.tar.gz" + "https://dl.bintray.com/boostorg/release/$_boost_ver/source/boost_${_boost_ver//./_}.tar.gz" + 'my.cnf' + 'mysql-user.conf' + 'build-hostname.patch' + 'no-werror.patch' + 'rocksdb-systemlibs.patch' + 'rocksdb-make.patch') +sha256sums=('31b980b0f87a8d261f5bdfd353e05dc92b261997a94c3df604d7ed2526fdc2d7' + '882b48708d211a5f48e60b0124cf5863c1534cd544ecd0664bb534a4b5d506e9' + 'b467b04d6d06152b2abc33f2a6de63fef0fc922dd5119d2ee1d07d3c1a489731' + 'e638a2657085f15b6728f43c1fd6aa551b27608fbf6b435e33afd3606a0cfb0e' + '1537fdbb92dd1c135c1eb9f4d10c44fd02e652db66c933d731990a1196f1397c' + 'fe1cb2b079c56ff0f827c7dfb25d004b2190410406820c490dc6152cfe392b70' + '1bbae30fe4c7d8198aaa771a20ca2fbeb6494de9ec4e516e4bab5f1387b3b8bd' + '2ff495d271f99c4d0dba89e8ccde7e6b9789a4ea6b55034de9b9217b47e32c03') + +prepare() { + cd $pkgbase-$_pkgver + rm -v sql/sql_yacc.{cc,h} + + patch -p1 -i "$srcdir"/build-hostname.patch + patch -p1 -i "$srcdir"/no-werror.patch + patch -p1 -i "$srcdir"/rocksdb-systemlibs.patch + patch -p1 -i "$srcdir"/rocksdb-make.patch + + for svcfile in mysqld{,@}.service.in; do + echo StateDirectory=mysql mysql-files >> scripts/systemd/$svcfile + echo RuntimeDirectory=mysqld >> scripts/systemd/$svcfile + done +} + +build() { + # rm -rf build + mkdir -p build + cd build + + cmake ../$pkgbase-$_pkgver \ + -Wno-dev \ + -DBUILD_CONFIG=mysql_release \ + -DREPRODUCIBLE_BUILD=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DSYSCONFDIR=/etc/mysql \ + -DMYSQL_DATADIR=/var/lib/mysql \ + -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \ + -DDEFAULT_CHARSET=utf8mb4 \ + -DDEFAULT_COLLATION=utf8mb4_general_ci \ + -DENABLED_LOCAL_INFILE=ON \ + -DINSTALL_INFODIR=share/doc/percona-server \ + -DINSTALL_DOCREADMEDIR=share/doc/percona-server \ + -DINSTALL_DOCDIR=share/doc/percona-server \ + -DINSTALL_MANDIR=share/man \ + -DINSTALL_PLUGINDIR=lib/perconaserver/plugin \ + -DINSTALL_SCRIPTDIR=bin \ + -DINSTALL_INCLUDEDIR=include/perconaserver \ + -DINSTALL_SUPPORTFILESDIR=share/mysql \ + -DINSTALL_MYSQLSHAREDIR=share/mysql \ + -DINSTALL_STATIC_LIBRARIES=OFF \ + -DWITH_ZLIB=system \ + -DWITH_LZ4=system \ + -DWITH_SSL=system \ + -DWITH_LIBWRAP=OFF \ + -DWITH_MECAB=OFF \ + -DWITH_PAM=ON \ + -DWITH_EMBEDDED_SERVER=ON \ + -DWITH_EMBEDDED_SHARED_LIBRARY=ON \ + -DWITH_INNODB_MEMCACHED=ON \ + -DWITH_ARCHIVE_STORAGE_ENGINE=ON \ + -DWITH_BLACKHOLE_STORAGE_ENGINE=ON \ + -DWITH_FEDERATED_STORAGE_ENGINE=ON \ + -DWITH_ROCKSDB=ON \ + -DTOKU_DEBUG_PARANOID=OFF \ + -DWITH_VALGRIND=OFF \ + -DUSE_VALGRIND=OFF \ + -DDEBUG_EXTNAME=OFF \ + -DBUILD_TESTING=OFF \ + -DWITH_UNIT_TESTS=OFF \ + -DUSE_GTAGS=OFF \ + -DUSE_CTAGS=OFF \ + -DUSE_ETAGS=OFF \ + -DUSE_CSCOPE=OFF \ + -DTOKUDB_BACKUP_PLUGIN_VERSION=$_pkgver \ + -DWITH_SYSTEMD=1 \ + -DWITH_SCALABILITY_METRICS=ON \ + -DCMAKE_EXE_LINKER_FLAGS='-ljemalloc' \ + -DWITH_BOOST=system \ + -DWITH_NUMA=ON \ + -DWITH_BOOST="../boost_${_boost_ver//./_}" + + make +} + +package_libperconaserverclient() { + pkgdesc='Percona Server client libraries' + depends=('zlib' 'openssl') + + cd build + for dir in include libmysql libservices; do + make -C $dir DESTDIR="$pkgdir" install + done + + # Conflicting files with mariadb-libs + rm -rf "$pkgdir"/usr/lib/{libmysqld.so*,libmysqlclient{,_r}.so*,perconaserver} + + install -Dm755 scripts/mysql_config "$pkgdir"/usr/bin/perconaserver_config + install -Dm644 "$srcdir"/$pkgbase-$_pkgver/man/mysql_config.1 "$pkgdir"/usr/share/man/man1/perconaserver_config.1 + + install -D -m0644 scripts/perconaserverclient.pc "$pkgdir"/usr/lib/pkgconfig/perconaserverclient.pc + install -D -m0644 "$srcdir"/$pkgbase-$_pkgver/support-files/mysql.m4 "$pkgdir"/usr/share/aclocal/perconaserverclient.m4 +} + +package_percona-server-clients() { + pkgdesc='Percona Server client tools' + depends=('libperconaserverclient' 'zlib' 'lz4' 'jemalloc' 'readline') + conflicts=('mysql-clients') + provides=("mysql-clients=$_myver" "mariadb-clients=$_myver") + + cd build + make -C client DESTDIR="$pkgdir" install + + # install man pages + install -d "$pkgdir"/usr/share/man/man1 + for man in mysql{,admin,check,dump,import,show,slap,pump,binlog,_upgrade}; do + install -m644 "$srcdir"/$pkgbase-$_pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1 + done + + # provided by percona-server + rm "$pkgdir"/usr/bin/mysql{_config_editor,_secure_installation,_ssl_rsa_setup} +} + +package_percona-server() { + pkgdesc='Drop-in replacement for MySQL that provides improved performance, diagnostics, instrumentation and MyRocks storage engine' + backup=('etc/mysql/my.cnf') + depends=('libaio' 'systemd-tools' 'pam' 'jemalloc' 'numactl' 'lz4' 'zstd' 'openssl' 'libtirpc' 'curl' 'boost-libs') + optdepends=('perl-dbd-mysql') + conflicts=('mysql') + provides=("mysql=$_myver" "mariadb=$_myver") + options=('emptydirs') + + cd build + make DESTDIR="$pkgdir" install + + install -Dm644 ../my.cnf "$pkgdir"/etc/mysql/my.cnf + install -Dm644 ../mysql-user.conf "$pkgdir"/usr/lib/sysusers.d/mysql.conf + + cd "$pkgdir" + chmod 755 usr + mv usr/usr/lib/* usr/lib + rm -rf usr/{usr,data,run,lib/perconaserver/plugin/debug,lib/tmpfiles.d/mysql.conf} + + # Move documentation + if [ -f usr/PATENTS ]; then + mv usr/{PATENTS,README.md} usr/share/doc/$pkgname/ + rm usr/COPYING.* usr/{LICENSE,README}.router + fi + + # provided by libperconaserverclient + rm usr/bin/mysql_config + rm usr/lib/lib{mysql,perconaserver}* + rm -r usr/include/ + rm usr/share/man/man1/mysql_config.1 + rm -r usr/share/aclocal usr/lib/pkgconfig + + # provided by percona-server-clients + rm usr/bin/mysql{,admin,check,dump,import,show,slap,pump,binlog,test,_upgrade} + rm usr/share/man/man1/mysql{,admin,check,dump,import,show,slap,pump,binlog,_upgrade}.1 + + # not needed + rm -r usr/mysql-test + rm usr/share/doc/percona-server/{INFO_*,mysql.info,*-test} +} Deleted: build-hostname.patch =================================================================== --- build-hostname.patch 2020-03-17 13:18:44 UTC (rev 600160) +++ build-hostname.patch 2020-03-17 13:19:18 UTC (rev 600161) @@ -1,17 +0,0 @@ -diff --git a/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCTest.cmake b/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCTest.cmake -index 5b6882cc..d165f3e7 100644 ---- a/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCTest.cmake -+++ b/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCTest.cmake -@@ -56,11 +56,7 @@ endmacro(whoami) - - ## gives the current hostname, minus .tokutek.com if it's there - macro(hostname out) -- execute_process( -- COMMAND hostname -- OUTPUT_VARIABLE fullhostname -- OUTPUT_STRIP_TRAILING_WHITESPACE) -- string(REGEX REPLACE "\\.tokutek\\.com$" "" ${out} "${fullhostname}") -+ set(${out} "archbuild") - endmacro(hostname) - - ## gather machine info Copied: percona-server/repos/community-x86_64/build-hostname.patch (from rev 600160, percona-server/trunk/build-hostname.patch) =================================================================== --- build-hostname.patch (rev 0) +++ build-hostname.patch 2020-03-17 13:19:18 UTC (rev 600161) @@ -0,0 +1,17 @@ +diff --git a/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCTest.cmake b/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCTest.cmake +index 5b6882cc..d165f3e7 100644 +--- a/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCTest.cmake ++++ b/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCTest.cmake +@@ -56,11 +56,7 @@ endmacro(whoami) + + ## gives the current hostname, minus .tokutek.com if it's there + macro(hostname out) +- execute_process( +- COMMAND hostname +- OUTPUT_VARIABLE fullhostname +- OUTPUT_STRIP_TRAILING_WHITESPACE) +- string(REGEX REPLACE "\\.tokutek\\.com$" "" ${out} "${fullhostname}") ++ set(${out} "archbuild") + endmacro(hostname) + + ## gather machine info Deleted: my.cnf =================================================================== --- my.cnf 2020-03-17 13:18:44 UTC (rev 600160) +++ my.cnf 2020-03-17 13:19:18 UTC (rev 600161) @@ -1,34 +0,0 @@ -# For advice on how to change settings please see -# http://dev.mysql.com/doc/refman/8.0/en/server-configuration-defaults.html - -[client] -socket = /run/mysqld/mysqld.sock - -[mysqld] -# -# Remove leading # and set to the amount of RAM for the most important data -# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%. -# innodb_buffer_pool_size = 128M -# -# Remove the leading "# " to disable binary logging -# Binary logging captures changes between backups and is enabled by -# default. It's default setting is log_bin=binlog -# disable_log_bin -# -# Remove leading # to set options mainly useful for reporting servers. -# The server defaults are faster for transactions and fast SELECTs. -# Adjust sizes as needed, experiment to find the optimal values. -# join_buffer_size = 128M -# sort_buffer_size = 2M -# read_rnd_buffer_size = 2M -# -# Remove leading # to revert to previous value for default_authentication_plugin, -# this will increase compatibility with older clients. For background, see: -# https://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html#sysvar_default_authentication_plugin -# default-authentication-plugin=mysql_native_password - -datadir = /var/lib/mysql -socket = /run/mysqld/mysqld.sock - -log-error = /var/log/mysqld.log -pid-file = /run/mysqld/mysqld.pid Copied: percona-server/repos/community-x86_64/my.cnf (from rev 600160, percona-server/trunk/my.cnf) =================================================================== --- my.cnf (rev 0) +++ my.cnf 2020-03-17 13:19:18 UTC (rev 600161) @@ -0,0 +1,34 @@ +# For advice on how to change settings please see +# http://dev.mysql.com/doc/refman/8.0/en/server-configuration-defaults.html + +[client] +socket = /run/mysqld/mysqld.sock + +[mysqld] +# +# Remove leading # and set to the amount of RAM for the most important data +# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%. +# innodb_buffer_pool_size = 128M +# +# Remove the leading "# " to disable binary logging +# Binary logging captures changes between backups and is enabled by +# default. It's default setting is log_bin=binlog +# disable_log_bin +# +# Remove leading # to set options mainly useful for reporting servers. +# The server defaults are faster for transactions and fast SELECTs. +# Adjust sizes as needed, experiment to find the optimal values. +# join_buffer_size = 128M +# sort_buffer_size = 2M +# read_rnd_buffer_size = 2M +# +# Remove leading # to revert to previous value for default_authentication_plugin, +# this will increase compatibility with older clients. For background, see: +# https://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html#sysvar_default_authentication_plugin +# default-authentication-plugin=mysql_native_password + +datadir = /var/lib/mysql +socket = /run/mysqld/mysqld.sock + +log-error = /var/log/mysqld.log +pid-file = /run/mysqld/mysqld.pid Deleted: mysql-user.conf =================================================================== --- mysql-user.conf 2020-03-17 13:18:44 UTC (rev 600160) +++ mysql-user.conf 2020-03-17 13:19:18 UTC (rev 600161) @@ -1 +0,0 @@ -u mysql 89 "MySQL user" Copied: percona-server/repos/community-x86_64/mysql-user.conf (from rev 600160, percona-server/trunk/mysql-user.conf) =================================================================== --- mysql-user.conf (rev 0) +++ mysql-user.conf 2020-03-17 13:19:18 UTC (rev 600161) @@ -0,0 +1 @@ +u mysql 89 "MySQL user" Deleted: no-werror.patch =================================================================== --- no-werror.patch 2020-03-17 13:18:44 UTC (rev 600160) +++ no-werror.patch 2020-03-17 13:19:18 UTC (rev 600161) @@ -1,28 +0,0 @@ -diff --git a/plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt b/plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt -index b10edec3..fb04ed59 100644 ---- a/plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt -+++ b/plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt -@@ -13,7 +13,7 @@ set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS - _FILE_OFFSET_BITS=64 - _LARGEFILE64_SOURCE) - --set(CMAKE_CXX_FLAGS "-Werror -W -Wall -Wshadow ${CMAKE_CXX_FLAGS}") -+set(CMAKE_CXX_FLAGS "-W -Wall -Wshadow ${CMAKE_CXX_FLAGS}") - - set(USE_VALGRIND OFF CACHE BOOL "whether to use valgrind headers") - if (USE_VALGRIND) -diff --git a/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake b/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake -index 502fd192..6d178667 100644 ---- a/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake -+++ b/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake -@@ -206,8 +206,8 @@ if (NOT CMAKE_CXX_COMPILER_ID STREQUAL Clang) - endif () - - ## always want these --set(CMAKE_C_FLAGS "-Wall -Werror ${CMAKE_C_FLAGS}") --set(CMAKE_CXX_FLAGS "-Wall -Werror ${CMAKE_CXX_FLAGS}") -+set(CMAKE_C_FLAGS "-Wall ${CMAKE_C_FLAGS}") -+set(CMAKE_CXX_FLAGS "-Wall ${CMAKE_CXX_FLAGS}") - - # pick language dialect - set(CMAKE_C_FLAGS "-std=c99 ${CMAKE_C_FLAGS}") Copied: percona-server/repos/community-x86_64/no-werror.patch (from rev 600160, percona-server/trunk/no-werror.patch) =================================================================== --- no-werror.patch (rev 0) +++ no-werror.patch 2020-03-17 13:19:18 UTC (rev 600161) @@ -0,0 +1,28 @@ +diff --git a/plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt b/plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt +index b10edec3..fb04ed59 100644 +--- a/plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt ++++ b/plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt +@@ -13,7 +13,7 @@ set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS + _FILE_OFFSET_BITS=64 + _LARGEFILE64_SOURCE) + +-set(CMAKE_CXX_FLAGS "-Werror -W -Wall -Wshadow ${CMAKE_CXX_FLAGS}") ++set(CMAKE_CXX_FLAGS "-W -Wall -Wshadow ${CMAKE_CXX_FLAGS}") + + set(USE_VALGRIND OFF CACHE BOOL "whether to use valgrind headers") + if (USE_VALGRIND) +diff --git a/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake b/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake +index 502fd192..6d178667 100644 +--- a/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake ++++ b/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake +@@ -206,8 +206,8 @@ if (NOT CMAKE_CXX_COMPILER_ID STREQUAL Clang) + endif () + + ## always want these +-set(CMAKE_C_FLAGS "-Wall -Werror ${CMAKE_C_FLAGS}") +-set(CMAKE_CXX_FLAGS "-Wall -Werror ${CMAKE_CXX_FLAGS}") ++set(CMAKE_C_FLAGS "-Wall ${CMAKE_C_FLAGS}") ++set(CMAKE_CXX_FLAGS "-Wall ${CMAKE_CXX_FLAGS}") + + # pick language dialect + set(CMAKE_C_FLAGS "-std=c99 ${CMAKE_C_FLAGS}") Deleted: rocksdb-make.patch =================================================================== --- rocksdb-make.patch 2020-03-17 13:18:44 UTC (rev 600160) +++ rocksdb-make.patch 2020-03-17 13:19:18 UTC (rev 600161) @@ -1,13 +0,0 @@ -diff --git a/storage/rocksdb/get_rocksdb_files.sh b/storage/rocksdb/get_rocksdb_files.sh -index dbaab0f..c68b158 100755 ---- a/storage/rocksdb/get_rocksdb_files.sh -+++ b/storage/rocksdb/get_rocksdb_files.sh -@@ -4,7 +4,7 @@ MKFILE=`mktemp` - # include rocksdb make file relative to the path of this script - echo "include rocksdb/src.mk - all: -- @echo \$(LIB_SOURCES)" > $MKFILE -+ @echo \"\$(LIB_SOURCES)\"" > $MKFILE - for f in `make --makefile $MKFILE` - do - echo ./rocksdb/$f Copied: percona-server/repos/community-x86_64/rocksdb-make.patch (from rev 600160, percona-server/trunk/rocksdb-make.patch) =================================================================== --- rocksdb-make.patch (rev 0) +++ rocksdb-make.patch 2020-03-17 13:19:18 UTC (rev 600161) @@ -0,0 +1,13 @@ +diff --git a/storage/rocksdb/get_rocksdb_files.sh b/storage/rocksdb/get_rocksdb_files.sh +index dbaab0f..c68b158 100755 +--- a/storage/rocksdb/get_rocksdb_files.sh ++++ b/storage/rocksdb/get_rocksdb_files.sh +@@ -4,7 +4,7 @@ MKFILE=`mktemp` + # include rocksdb make file relative to the path of this script + echo "include rocksdb/src.mk + all: +- @echo \$(LIB_SOURCES)" > $MKFILE ++ @echo \"\$(LIB_SOURCES)\"" > $MKFILE + for f in `make --makefile $MKFILE` + do + echo ./rocksdb/$f Deleted: rocksdb-systemlibs.patch =================================================================== --- rocksdb-systemlibs.patch 2020-03-17 13:18:44 UTC (rev 600160) +++ rocksdb-systemlibs.patch 2020-03-17 13:19:18 UTC (rev 600161) @@ -1,52 +0,0 @@ -diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt -index b8b698d..cef5336 100644 ---- a/storage/rocksdb/CMakeLists.txt -+++ b/storage/rocksdb/CMakeLists.txt -@@ -116,38 +116,11 @@ EXECUTE_PROCESS( - # split the list into lines - STRING(REGEX MATCHALL "[^\n]+" ROCKSDB_LIB_SOURCES ${SCRIPT_OUTPUT}) - --# add bundled compression code --SET(ROCKSDB_LIB_SOURCES -- ${ROCKSDB_LIB_SOURCES} -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lz4/lib/lz4.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lz4/lib/lz4hc.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lz4/lib/lz4frame.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/entropy_common.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/error_private.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/fse_decompress.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/pool.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/threading.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/xxhash.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/zstd_common.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/fse_compress.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/huf_compress.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/zstd_compress.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/zstdmt_compress.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/decompress/huf_decompress.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/decompress/zstd_decompress.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/dictBuilder/divsufsort.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/dictBuilder/zdict.c --) -- - INCLUDE_DIRECTORIES( - ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb - ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include - ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include/rocksdb - ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/third-party/gtest-1.7.0/fused-src -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lz4/lib -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/dictBuilder - ) - - ADD_DEFINITIONS(-DROCKSDB_PLATFORM_POSIX -DROCKSDB_LIB_IO_POSIX -DZLIB -DLZ4 -@@ -184,7 +157,7 @@ SET(ROCKSDB_SOURCES - ${ROCKSDB_LIB_SOURCES} - ) - --SET(rocksdb_static_libs ${rocksdb_static_libs} ${ZLIB_LIBRARY} "-lrt") -+SET(rocksdb_static_libs ${rocksdb_static_libs} ${ZLIB_LIBRARY} "-lrt -llz4 -lzstd") - - MYSQL_ADD_PLUGIN(rocksdb ${ROCKSDB_SOURCES} STORAGE_ENGINE DEFAULT MODULE_ONLY - LINK_LIBRARIES ${rocksdb_static_libs} Copied: percona-server/repos/community-x86_64/rocksdb-systemlibs.patch (from rev 600160, percona-server/trunk/rocksdb-systemlibs.patch) =================================================================== --- rocksdb-systemlibs.patch (rev 0) +++ rocksdb-systemlibs.patch 2020-03-17 13:19:18 UTC (rev 600161) @@ -0,0 +1,52 @@ +diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt +index b8b698d..cef5336 100644 +--- a/storage/rocksdb/CMakeLists.txt ++++ b/storage/rocksdb/CMakeLists.txt +@@ -116,38 +116,11 @@ EXECUTE_PROCESS( + # split the list into lines + STRING(REGEX MATCHALL "[^\n]+" ROCKSDB_LIB_SOURCES ${SCRIPT_OUTPUT}) + +-# add bundled compression code +-SET(ROCKSDB_LIB_SOURCES +- ${ROCKSDB_LIB_SOURCES} +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lz4/lib/lz4.c +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lz4/lib/lz4hc.c +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lz4/lib/lz4frame.c +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/entropy_common.c +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/error_private.c +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/fse_decompress.c +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/pool.c +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/threading.c +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/xxhash.c +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/zstd_common.c +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/fse_compress.c +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/huf_compress.c +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/zstd_compress.c +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/zstdmt_compress.c +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/decompress/huf_decompress.c +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/decompress/zstd_decompress.c +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/dictBuilder/divsufsort.c +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/dictBuilder/zdict.c +-) +- + INCLUDE_DIRECTORIES( + ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb + ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include + ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include/rocksdb + ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/third-party/gtest-1.7.0/fused-src +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lz4/lib +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/dictBuilder + ) + + ADD_DEFINITIONS(-DROCKSDB_PLATFORM_POSIX -DROCKSDB_LIB_IO_POSIX -DZLIB -DLZ4 +@@ -184,7 +157,7 @@ SET(ROCKSDB_SOURCES + ${ROCKSDB_LIB_SOURCES} + ) + +-SET(rocksdb_static_libs ${rocksdb_static_libs} ${ZLIB_LIBRARY} "-lrt") ++SET(rocksdb_static_libs ${rocksdb_static_libs} ${ZLIB_LIBRARY} "-lrt -llz4 -lzstd") + + MYSQL_ADD_PLUGIN(rocksdb ${ROCKSDB_SOURCES} STORAGE_ENGINE DEFAULT MODULE_ONLY + LINK_LIBRARIES ${rocksdb_static_libs}