mysql57: remove derivation files
`mysql57` was dropped in a5c9290979 but
the derivation files were kept. They can now be removed.
This commit is contained in:
Thomas Gerbet
parent
b7eb3ded98
commit
42b5fa9e3b
2 changed files with 0 additions and 160 deletions
|
|
@ -1,94 +0,0 @@
|
|||
{ lib, stdenv, fetchurl, cmake, bison, pkg-config, nukeReferences
|
||||
, boost, libedit, libevent, lz4, ncurses, openssl, protobuf, readline, zlib, perl
|
||||
, cctools, CoreServices, developer_cmds
|
||||
, libtirpc, rpcsvc-proto, nixosTests
|
||||
}:
|
||||
|
||||
# Note: zlib is not required; MySQL can use an internal zlib.
|
||||
|
||||
let
|
||||
self = stdenv.mkDerivation rec {
|
||||
pname = "mysql";
|
||||
version = "5.7.39";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://mysql/MySQL-5.7/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-ERw6ypGJfkUwOds5GkdSZeAg/ZIcuXMHwACEqI5NYQQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./mysql-5.7-add-protobuf-3.8+-support.patch
|
||||
];
|
||||
|
||||
preConfigure = lib.optionalString stdenv.isDarwin ''
|
||||
ln -s /bin/ps $TMPDIR/ps
|
||||
export PATH=$PATH:$TMPDIR
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ bison cmake pkg-config nukeReferences ]
|
||||
++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ];
|
||||
|
||||
buildInputs = [ boost libedit libevent lz4 ncurses openssl protobuf readline zlib ]
|
||||
++ lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ]
|
||||
++ lib.optionals stdenv.isLinux [ libtirpc ];
|
||||
|
||||
outputs = [ "out" "static" ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DWITH_SSL=yes"
|
||||
"-DWITH_EMBEDDED_SERVER=yes"
|
||||
"-DWITH_UNIT_TESTS=no"
|
||||
"-DWITH_EDITLINE=system"
|
||||
"-DWITH_LIBEVENT=system"
|
||||
"-DWITH_LZ4=system"
|
||||
"-DWITH_PROTOBUF=system"
|
||||
"-DWITH_ZLIB=system"
|
||||
"-DWITH_ARCHIVE_STORAGE_ENGINE=yes"
|
||||
"-DWITH_BLACKHOLE_STORAGE_ENGINE=yes"
|
||||
"-DWITH_FEDERATED_STORAGE_ENGINE=yes"
|
||||
"-DHAVE_IPV6=yes"
|
||||
"-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
|
||||
"-DMYSQL_DATADIR=/var/lib/mysql"
|
||||
"-DINSTALL_INFODIR=share/mysql/docs"
|
||||
"-DINSTALL_MANDIR=share/man"
|
||||
"-DINSTALL_PLUGINDIR=lib/mysql/plugin"
|
||||
"-DINSTALL_SCRIPTDIR=bin"
|
||||
"-DINSTALL_INCLUDEDIR=include/mysql"
|
||||
"-DINSTALL_DOCREADMEDIR=share/mysql"
|
||||
"-DINSTALL_SUPPORTFILESDIR=share/mysql"
|
||||
"-DINSTALL_MYSQLSHAREDIR=share/mysql"
|
||||
"-DINSTALL_MYSQLTESTDIR="
|
||||
"-DINSTALL_DOCDIR=share/mysql/docs"
|
||||
"-DINSTALL_SHAREDIR=share/mysql"
|
||||
];
|
||||
|
||||
CXXFLAGS = "-fpermissive -std=c++11";
|
||||
NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s";
|
||||
|
||||
prePatch = ''
|
||||
sed -i -e "s|/usr/bin/libtool|libtool|" cmake/merge_archives.cmake.in
|
||||
'';
|
||||
postInstall = ''
|
||||
nuke-refs "$out/share/mysql/docs/INFO_BIN"
|
||||
moveToOutput "lib/*.a" $static
|
||||
ln -s libmysqlclient${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libmysqlclient_r${stdenv.hostPlatform.extensions.sharedLibrary}
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
client = self;
|
||||
connector-c = self;
|
||||
server = self;
|
||||
mysqlVersion = "5.7";
|
||||
tests = nixosTests.mysql.mysql57;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.mysql.com/";
|
||||
description = "The world's most popular open source database";
|
||||
platforms = platforms.unix;
|
||||
license = with licenses; [
|
||||
artistic1 bsd0 bsd2 bsd3 bsdOriginal
|
||||
gpl2 lgpl2 lgpl21 mit publicDomain licenses.zlib
|
||||
];
|
||||
};
|
||||
}; in self
|
||||
|
|
@ -1,66 +0,0 @@
|
|||
diff --git a/cmake/build_configurations/compiler_options.cmake b/cmake/build_configurations/compiler_options.cmake
|
||||
index a935227e523..b4ebd61c5c1 100644
|
||||
--- a/cmake/build_configurations/compiler_options.cmake
|
||||
+++ b/cmake/build_configurations/compiler_options.cmake
|
||||
@@ -43,7 +43,7 @@ IF(UNIX)
|
||||
|
||||
# Default GCC flags
|
||||
IF(CMAKE_COMPILER_IS_GNUCC)
|
||||
- SET(COMMON_C_FLAGS "-fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
|
||||
+ SET(COMMON_C_FLAGS "-fno-omit-frame-pointer -fno-strict-aliasing")
|
||||
# Disable inline optimizations for valgrind testing to avoid false positives
|
||||
IF(WITH_VALGRIND)
|
||||
STRING_PREPEND(COMMON_C_FLAGS "-fno-inline ")
|
||||
@@ -68,7 +68,7 @@ IF(UNIX)
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
IF(CMAKE_COMPILER_IS_GNUCXX)
|
||||
- SET(COMMON_CXX_FLAGS "-fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
|
||||
+ SET(COMMON_CXX_FLAGS "-fno-omit-frame-pointer -fno-strict-aliasing")
|
||||
# GCC 6 has C++14 as default, set it explicitly to the old default.
|
||||
EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
|
||||
OUTPUT_VARIABLE GXX_VERSION)
|
||||
diff --git a/rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc b/rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc
|
||||
index 5dc91ba269c..3a45284859f 100644
|
||||
--- a/rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc
|
||||
+++ b/rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc
|
||||
@@ -629,12 +629,12 @@ class ErrorDumper : public ::google::protobuf::io::ErrorCollector
|
||||
std::stringstream m_out;
|
||||
|
||||
public:
|
||||
- virtual void AddError(int line, int column, const string & message)
|
||||
+ virtual void AddError(int line, int column, const std::string & message)
|
||||
{
|
||||
m_out << "ERROR in message: line " << line+1 << ": column " << column << ": " << message<<"\n";
|
||||
}
|
||||
|
||||
- virtual void AddWarning(int line, int column, const string & message)
|
||||
+ virtual void AddWarning(int line, int column, const std::string & message)
|
||||
{
|
||||
m_out << "WARNING in message: line " << line+1 << ": column " << column << ": " << message<<"\n";
|
||||
}
|
||||
diff --git a/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h b/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h
|
||||
index 90f7cc77a39..cf6c607a818 100644
|
||||
--- a/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h
|
||||
+++ b/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h
|
||||
@@ -36,7 +36,6 @@
|
||||
#include <google/protobuf/io/tokenizer.h>
|
||||
#include <google/protobuf/io/zero_copy_stream.h>
|
||||
#include <google/protobuf/wire_format_lite.h>
|
||||
-#include <google/protobuf/wire_format_lite_inl.h>
|
||||
#include <google/protobuf/dynamic_message.h>
|
||||
|
||||
#include "mysqlx_connection.pb.h"
|
||||
diff --git a/rapid/plugin/x/ngs/src/protocol_decoder.cc b/rapid/plugin/x/ngs/src/protocol_decoder.cc
|
||||
index 298b6a6884c..fae21d18f78 100644
|
||||
--- a/rapid/plugin/x/ngs/src/protocol_decoder.cc
|
||||
+++ b/rapid/plugin/x/ngs/src/protocol_decoder.cc
|
||||
@@ -123,7 +123,7 @@ Error_code Message_decoder::parse(Request &request)
|
||||
google::protobuf::io::CodedInputStream stream(reinterpret_cast<const uint8_t*>(request.buffer()),
|
||||
static_cast<int>(request.buffer_size()));
|
||||
// variable 'mysqlx_max_allowed_packet' has been checked when buffer was filling by data
|
||||
- stream.SetTotalBytesLimit(static_cast<int>(request.buffer_size()), -1 /*no warnings*/);
|
||||
+ stream.SetTotalBytesLimit(static_cast<int>(request.buffer_size()));
|
||||
// Protobuf limits the number of nested objects when decoding messages
|
||||
// lets set the value in explicit way (to ensure that is set accordingly with
|
||||
// out stack size)
|
||||
Loading…
Reference in a new issue