uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
6
pkgs/servers/sql/mariadb/connector-c/3_1.nix
Normal file
6
pkgs/servers/sql/mariadb/connector-c/3_1.nix
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
{ callPackage, ... } @ args:
|
||||
|
||||
callPackage ./. (args // {
|
||||
version = "3.1.13";
|
||||
sha256 = "0xb8fiissblxb319y5ifqqp86zblwis789ipb753pcb4zpnsaw82";
|
||||
})
|
||||
6
pkgs/servers/sql/mariadb/connector-c/3_2.nix
Normal file
6
pkgs/servers/sql/mariadb/connector-c/3_2.nix
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
{ callPackage, ... } @ args:
|
||||
|
||||
callPackage ./. (args // {
|
||||
version = "3.2.5";
|
||||
sha256 = "0w0fimdiiqrrm012iflz8l4rnafryq7y0qqijzxn7nwzxhm9jsr9";
|
||||
})
|
||||
68
pkgs/servers/sql/mariadb/connector-c/default.nix
Normal file
68
pkgs/servers/sql/mariadb/connector-c/default.nix
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
{ lib, stdenv, fetchurl, cmake
|
||||
, curl, openssl, zlib
|
||||
, libiconv
|
||||
, version, sha256, ...
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "mariadb-connector-c";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.mariadb.com/Connectors/c/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DMARIADB_UNIX_ADDR=/run/mysqld/mysqld.sock"
|
||||
"-DWITH_CURL=ON"
|
||||
"-DWITH_EXTERNAL_ZLIB=ON"
|
||||
"-DWITH_MYSQLCOMPAT=ON"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace mariadb_config/mariadb_config.c.in \
|
||||
--replace '-I%s/@INSTALL_INCLUDEDIR@' "-I$dev/include" \
|
||||
--replace '-L%s/@INSTALL_LIBDIR@' "-L$out/lib/mariadb"
|
||||
'' + lib.optionalString stdenv.hostPlatform.isStatic ''
|
||||
# Disables all dynamic plugins
|
||||
substituteInPlace cmake/plugins.cmake \
|
||||
--replace 'if(''${CC_PLUGIN_DEFAULT} STREQUAL "DYNAMIC")' 'if(''${CC_PLUGIN_DEFAULT} STREQUAL "INVALID")'
|
||||
# Force building static libraries
|
||||
substituteInPlace libmariadb/CMakeLists.txt \
|
||||
--replace 'libmariadb SHARED' 'libmariadb STATIC'
|
||||
'';
|
||||
|
||||
# The cmake setup-hook uses $out/lib by default, this is not the case here.
|
||||
preConfigure = optionalString stdenv.isDarwin ''
|
||||
cmakeFlagsArray+=("-DCMAKE_INSTALL_NAME_DIR=$out/lib/mariadb")
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
propagatedBuildInputs = [ curl openssl zlib ];
|
||||
buildInputs = [ libiconv ];
|
||||
|
||||
postInstall = ''
|
||||
moveToOutput bin/mariadb_config "$dev"
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
ln -sv mariadb_config $dev/bin/mysql_config
|
||||
ln -sv mariadb $out/lib/mysql
|
||||
ln -sv mariadb $dev/include/mysql
|
||||
ln -sv mariadb_version.h $dev/include/mariadb/mysql_version.h
|
||||
ln -sv libmariadb.pc $dev/lib/pkgconfig/mysqlclient.pc
|
||||
install -Dm644 include/ma_config.h $dev/include/mariadb/my_config.h
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Client library that can be used to connect to MySQL or MariaDB";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ globin ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
264
pkgs/servers/sql/mariadb/default.nix
Normal file
264
pkgs/servers/sql/mariadb/default.nix
Normal file
|
|
@ -0,0 +1,264 @@
|
|||
{ lib, stdenv, fetchurl, nixosTests, buildPackages
|
||||
# Native buildInputs components
|
||||
, bison, boost, cmake, fixDarwinDylibNames, flex, makeWrapper, pkg-config
|
||||
# Common components
|
||||
, curl, libiconv, ncurses, openssl, pcre, pcre2
|
||||
, libkrb5, libaio, liburing, systemd
|
||||
, CoreServices, cctools, perl
|
||||
, jemalloc, less, libedit
|
||||
# Server components
|
||||
, bzip2, lz4, lzo, snappy, xz, zlib, zstd
|
||||
, cracklib, judy, libevent, libxml2
|
||||
, linux-pam, numactl, pmdk
|
||||
, fmt_8
|
||||
, withStorageMroonga ? true, kytea, libsodium, msgpack, zeromq
|
||||
, withStorageRocks ? true
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
libExt = stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
|
||||
mytopEnv = buildPackages.perl.withPackages (p: with p; [ DBDmysql DBI TermReadKey ]);
|
||||
|
||||
mariadbPackage = packageSettings: (server packageSettings) // {
|
||||
client = client packageSettings; # MariaDB Client
|
||||
server = server packageSettings; # MariaDB Server
|
||||
};
|
||||
|
||||
commonOptions = packageSettings: rec { # attributes common to both builds
|
||||
inherit (packageSettings) version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz";
|
||||
inherit (packageSettings) sha256;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames
|
||||
++ lib.optional (!stdenv.hostPlatform.isDarwin) makeWrapper;
|
||||
|
||||
buildInputs = [
|
||||
curl libiconv ncurses openssl zlib
|
||||
] ++ (packageSettings.extraBuildInputs or [])
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux ([ libkrb5 systemd ]
|
||||
++ (if (lib.versionOlder version "10.6") then [ libaio ] else [ liburing ]))
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices cctools perl libedit ]
|
||||
++ lib.optional (!stdenv.hostPlatform.isDarwin) [ jemalloc ]
|
||||
++ (if (lib.versionOlder version "10.5") then [ pcre ] else [ pcre2 ]);
|
||||
|
||||
prePatch = ''
|
||||
sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt
|
||||
'';
|
||||
|
||||
patches = [
|
||||
./patch/cmake-includedir.patch
|
||||
]
|
||||
# Fixes a build issue as documented on
|
||||
# https://jira.mariadb.org/browse/MDEV-26769?focusedCommentId=206073&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-206073
|
||||
++ lib.optional (!stdenv.hostPlatform.isLinux && lib.versionAtLeast version "10.6") ./patch/macos-MDEV-26769-regression-fix.patch;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_CONFIG=mysql_release"
|
||||
"-DMANUFACTURER=nixos.org"
|
||||
"-DDEFAULT_CHARSET=utf8mb4"
|
||||
"-DDEFAULT_COLLATION=utf8mb4_unicode_ci"
|
||||
"-DSECURITY_HARDENED=ON"
|
||||
|
||||
"-DINSTALL_UNIX_ADDRDIR=/run/mysqld/mysqld.sock"
|
||||
"-DINSTALL_BINDIR=bin"
|
||||
"-DINSTALL_DOCDIR=share/doc/mysql"
|
||||
"-DINSTALL_DOCREADMEDIR=share/doc/mysql"
|
||||
"-DINSTALL_INCLUDEDIR=include/mysql"
|
||||
"-DINSTALL_LIBDIR=lib"
|
||||
"-DINSTALL_PLUGINDIR=lib/mysql/plugin"
|
||||
"-DINSTALL_INFODIR=share/mysql/docs"
|
||||
"-DINSTALL_MANDIR=share/man"
|
||||
"-DINSTALL_MYSQLSHAREDIR=share/mysql"
|
||||
"-DINSTALL_SCRIPTDIR=bin"
|
||||
"-DINSTALL_SUPPORTFILESDIR=share/doc/mysql"
|
||||
"-DINSTALL_MYSQLTESTDIR=OFF"
|
||||
"-DINSTALL_SQLBENCHDIR=OFF"
|
||||
"-DINSTALL_PAMDIR=share/pam/lib/security"
|
||||
"-DINSTALL_PAMDATADIR=share/pam/etc/security"
|
||||
|
||||
"-DWITH_ZLIB=system"
|
||||
"-DWITH_SSL=system"
|
||||
"-DWITH_PCRE=system"
|
||||
"-DWITH_SAFEMALLOC=OFF"
|
||||
"-DWITH_UNIT_TESTS=OFF"
|
||||
"-DEMBEDDED_LIBRARY=OFF"
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# On Darwin without sandbox, CMake will find the system java and attempt to build with java support, but
|
||||
# then it will fail during the actual build. Let's just disable the flag explicitly until someone decides
|
||||
# to pass in java explicitly.
|
||||
"-DCONNECT_WITH_JDBC=OFF"
|
||||
"-DCURSES_LIBRARY=${ncurses.out}/lib/libncurses.dylib"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
# Remove Development components. Need to use libmysqlclient.
|
||||
rm "$out"/lib/mysql/plugin/daemon_example.ini
|
||||
rm "$out"/lib/{libmariadbclient.a,libmysqlclient.a,libmysqlclient_r.a,libmysqlservices.a}
|
||||
rm -f "$out"/bin/{mariadb-config,mariadb_config,mysql_config}
|
||||
rm -r $out/include
|
||||
rm -r $out/lib/pkgconfig
|
||||
'';
|
||||
|
||||
# perlPackages.DBDmysql is broken on darwin
|
||||
postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
wrapProgram $out/bin/mytop --set PATH ${lib.makeBinPath [ less ncurses ]}
|
||||
'';
|
||||
|
||||
passthru.tests = let
|
||||
testVersion = "mariadb_${builtins.replaceStrings ["."] [""] (lib.versions.majorMinor (packageSettings.version))}";
|
||||
in {
|
||||
mariadb-galera-rsync = nixosTests.mariadb-galera.${testVersion};
|
||||
mysql = nixosTests.mysql.${testVersion};
|
||||
mysql-autobackup = nixosTests.mysql-autobackup.${testVersion};
|
||||
mysql-backup = nixosTests.mysql-backup.${testVersion};
|
||||
mysql-replication = nixosTests.mysql-replication.${testVersion};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "An enhanced, drop-in replacement for MySQL";
|
||||
homepage = "https://mariadb.org/";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ thoughtpolice ajs124 das_j ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
};
|
||||
|
||||
client = packageSettings: let
|
||||
common = commonOptions packageSettings;
|
||||
|
||||
in stdenv.mkDerivation (common // {
|
||||
pname = "mariadb-client";
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
patches = common.patches ++ [
|
||||
./patch/cmake-plugin-includedir.patch
|
||||
];
|
||||
|
||||
cmakeFlags = common.cmakeFlags ++ [
|
||||
"-DPLUGIN_AUTH_PAM=NO"
|
||||
"-DWITHOUT_SERVER=ON"
|
||||
"-DWITH_WSREP=OFF"
|
||||
"-DINSTALL_MYSQLSHAREDIR=share/mysql-client"
|
||||
];
|
||||
|
||||
postInstall = common.postInstall + ''
|
||||
rm "$out"/bin/{mariadb-test,mysqltest}
|
||||
libmysqlclient_path=$(readlink -f $out/lib/libmysqlclient${libExt})
|
||||
rm "$out"/lib/{libmariadb${libExt},libmysqlclient${libExt},libmysqlclient_r${libExt}}
|
||||
mv "$libmysqlclient_path" "$out"/lib/libmysqlclient${libExt}
|
||||
ln -sv libmysqlclient${libExt} "$out"/lib/libmysqlclient_r${libExt}
|
||||
'';
|
||||
});
|
||||
|
||||
server = packageSettings: let
|
||||
common = commonOptions packageSettings;
|
||||
|
||||
in stdenv.mkDerivation (common // {
|
||||
pname = "mariadb-server";
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
nativeBuildInputs = common.nativeBuildInputs ++ [ bison boost.dev flex ];
|
||||
|
||||
buildInputs = common.buildInputs ++ [
|
||||
bzip2 lz4 lzo snappy xz zstd
|
||||
cracklib judy libevent libxml2
|
||||
] ++ lib.optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) numactl
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ linux-pam ]
|
||||
++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) pmdk.dev
|
||||
++ lib.optional (!stdenv.hostPlatform.isDarwin) mytopEnv
|
||||
++ lib.optionals withStorageMroonga [ kytea libsodium msgpack zeromq ]
|
||||
++ lib.optionals (lib.versionAtLeast common.version "10.7") [ fmt_8 ];
|
||||
|
||||
patches = common.patches;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace scripts/galera_new_cluster.sh \
|
||||
--replace ":-mariadb" ":-mysql"
|
||||
'';
|
||||
|
||||
cmakeFlags = common.cmakeFlags ++ [
|
||||
"-DMYSQL_DATADIR=/var/lib/mysql"
|
||||
"-DENABLED_LOCAL_INFILE=OFF"
|
||||
"-DWITH_READLINE=ON"
|
||||
"-DWITH_EXTRA_CHARSETS=all"
|
||||
"-DWITH_EMBEDDED_SERVER=OFF"
|
||||
"-DWITH_UNIT_TESTS=OFF"
|
||||
"-DWITH_WSREP=ON"
|
||||
"-DWITH_INNODB_DISALLOW_WRITES=ON"
|
||||
"-DWITHOUT_EXAMPLE=1"
|
||||
"-DWITHOUT_FEDERATED=1"
|
||||
"-DWITHOUT_TOKUDB=1"
|
||||
] ++ lib.optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) [
|
||||
"-DWITH_NUMA=ON"
|
||||
] ++ lib.optional (!withStorageMroonga) [
|
||||
"-DWITHOUT_MROONGA=1"
|
||||
] ++ lib.optional (!withStorageRocks) [
|
||||
"-DWITHOUT_ROCKSDB=1"
|
||||
] ++ lib.optional (!stdenv.hostPlatform.isDarwin && withStorageRocks) [
|
||||
"-DWITH_ROCKSDB_JEMALLOC=ON"
|
||||
] ++ lib.optional (!stdenv.hostPlatform.isDarwin) [
|
||||
"-DWITH_JEMALLOC=yes"
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
"-DPLUGIN_AUTH_PAM=NO"
|
||||
"-DPLUGIN_AUTH_PAM_V1=NO"
|
||||
"-DWITHOUT_OQGRAPH=1"
|
||||
"-DWITHOUT_PLUGIN_S3=1"
|
||||
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
# revisit this if nixpkgs supports any architecture whose stack grows upwards
|
||||
"-DSTACK_DIRECTION=-1"
|
||||
"-DCMAKE_CROSSCOMPILING_EMULATOR=${stdenv.hostPlatform.emulator buildPackages}"
|
||||
];
|
||||
|
||||
preConfigure = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
patchShebangs scripts/mytop.sh
|
||||
'';
|
||||
|
||||
postInstall = common.postInstall + ''
|
||||
rm -r "$out"/share/aclocal
|
||||
chmod +x "$out"/bin/wsrep_sst_common
|
||||
rm -f "$out"/bin/{mariadb-client-test,mariadb-test,mysql_client_test,mysqltest}
|
||||
'' + lib.optionalString withStorageMroonga ''
|
||||
mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql
|
||||
'' + lib.optionalString (!stdenv.hostPlatform.isDarwin && lib.versionAtLeast common.version "10.4") ''
|
||||
mv "$out"/OFF/suite/plugins/pam/pam_mariadb_mtr.so "$out"/share/pam/lib/security
|
||||
mv "$out"/OFF/suite/plugins/pam/mariadb_mtr "$out"/share/pam/etc/security
|
||||
rm -r "$out"/OFF
|
||||
'';
|
||||
|
||||
CXXFLAGS = lib.optionalString stdenv.hostPlatform.isi686 "-fpermissive";
|
||||
});
|
||||
in {
|
||||
mariadb_104 = mariadbPackage {
|
||||
# Supported until 2024-06-18
|
||||
version = "10.4.25";
|
||||
sha256 = "1y3ym8pb0pyra3dwy8sbzc4656c4y7g1savgyrsvf1mw2573r5pz";
|
||||
};
|
||||
mariadb_105 = mariadbPackage {
|
||||
# Supported until 2025-06-24
|
||||
version = "10.5.16";
|
||||
sha256 = "19nj7ilk1aqs9zvvzhx4619pgfqjp7ac90ffr3fdaw4viljqfgn1";
|
||||
};
|
||||
mariadb_106 = mariadbPackage {
|
||||
# Supported until 2026-07
|
||||
version = "10.6.8";
|
||||
sha256 = "0f6lkvv0dbq64y7zpks7nvhy1n08gad0i0dp0s2zpgfcb62liaap";
|
||||
};
|
||||
mariadb_107 = mariadbPackage {
|
||||
# Supported until 2023-02
|
||||
version = "10.7.4";
|
||||
sha256 = "0ws17azsw3f26pkphjkyxmmi9qbv9gwidvz0ll6g482m6afrrpbk";
|
||||
};
|
||||
mariadb_108 = mariadbPackage {
|
||||
# Supported until 2023-05
|
||||
version = "10.8.3";
|
||||
sha256 = "14h80lfb9b3rv3fd8nkljbqhx6dmwjnqkz6c3ynixb3na72sszl8";
|
||||
};
|
||||
}
|
||||
39
pkgs/servers/sql/mariadb/galera/default.nix
Normal file
39
pkgs/servers/sql/mariadb/galera/default.nix
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
{ lib, stdenv, fetchFromGitHub, buildEnv
|
||||
, asio, boost, check, openssl, cmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mariadb-galera";
|
||||
version = "26.4.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "codership";
|
||||
repo = "galera";
|
||||
rev = "release_${version}";
|
||||
sha256 = "sha256-zAS/YCUNSgkjehUXJpa+FyPC6zHnx3Nmlx0m7hbuZo0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ asio boost.dev check openssl ];
|
||||
|
||||
preConfigure = ''
|
||||
# make sure bundled asio cannot be used, but leave behind license, because it gets installed
|
||||
rm -r asio/{asio,asio.hpp}
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# for backwards compatibility
|
||||
mkdir $out/lib/galera
|
||||
ln -s $out/lib/libgalera_smm.so $out/lib/galera/libgalera_smm.so
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Galera 3 wsrep provider library";
|
||||
homepage = "https://galeracluster.com/";
|
||||
license = licenses.lgpl2Only;
|
||||
maintainers = with maintainers; [ ajs124 izorkin ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
11
pkgs/servers/sql/mariadb/patch/cmake-includedir.patch
Normal file
11
pkgs/servers/sql/mariadb/patch/cmake-includedir.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- a/include/CMakeLists.txt 2017-12-25 05:59:07.204144374 +0100
|
||||
+++ b/include/CMakeLists.txt 2017-12-25 05:59:26.339552817 +0100
|
||||
@@ -94,7 +94,7 @@
|
||||
ENDIF()
|
||||
|
||||
MACRO(INSTALL_COMPAT_HEADER file footer)
|
||||
- INSTALL(CODE "FILE(WRITE \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_INCLUDEDIR}/${file}
|
||||
+ INSTALL(CODE "FILE(WRITE ${INSTALL_INCLUDEDIR}/${file}
|
||||
\"/* Do not edit this file directly, it was auto-generated by cmake */
|
||||
|
||||
#warning This file should not be included by clients, include only <mysql.h>
|
||||
16
pkgs/servers/sql/mariadb/patch/cmake-plugin-includedir.patch
Normal file
16
pkgs/servers/sql/mariadb/patch/cmake-plugin-includedir.patch
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake
|
||||
index 31291d26..fad52814 100644
|
||||
--- a/cmake/plugin.cmake
|
||||
+++ b/cmake/plugin.cmake
|
||||
@@ -34,6 +34,11 @@ MACRO(MYSQL_ADD_PLUGIN)
|
||||
"LINK_LIBRARIES;DEPENDENCIES"
|
||||
${ARGN}
|
||||
)
|
||||
+
|
||||
+ IF(WITHOUT_SERVER OR ARG_CLIENT)
|
||||
+ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
|
||||
+ ENDIF()
|
||||
+
|
||||
IF(NOT WITHOUT_SERVER OR ARG_CLIENT)
|
||||
|
||||
# Add common include directories
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
diff -ru a/storage/innobase/include/buf0types.h b/storage/innobase/include/buf0types.h
|
||||
--- a/storage/innobase/include/buf0types.h 2021-11-17 02:37:32.000000000 -0500
|
||||
+++ b/storage/innobase/include/buf0types.h 2021-11-17 02:38:50.000000000 -0500
|
||||
@@ -179,7 +179,7 @@
|
||||
#include "sux_lock.h"
|
||||
|
||||
#ifdef SUX_LOCK_GENERIC
|
||||
-class page_hash_latch : private rw_lock
|
||||
+class page_hash_latch : public rw_lock
|
||||
{
|
||||
/** Wait for a shared lock */
|
||||
void read_lock_wait();
|
||||
Loading…
Add table
Add a link
Reference in a new issue