diff options
| author | Izorkin <izorkin@elven.pw> | 2019-08-01 19:41:57 +0300 |
|---|---|---|
| committer | Izorkin <izorkin@elven.pw> | 2019-08-01 20:26:23 +0300 |
| commit | 12f95f75726ded0807d0184b3b55084fcddca5ea (patch) | |
| tree | d88c31c801e6258a8fba3d4b7f72996db233b8d7 /pkgs/servers/sql | |
| parent | 0b8da0cbfb425dd312c10f875d68eb7a4f446d14 (diff) | |
| download | nixlib-12f95f75726ded0807d0184b3b55084fcddca5ea.tar nixlib-12f95f75726ded0807d0184b3b55084fcddca5ea.tar.gz nixlib-12f95f75726ded0807d0184b3b55084fcddca5ea.tar.bz2 nixlib-12f95f75726ded0807d0184b3b55084fcddca5ea.tar.lz nixlib-12f95f75726ded0807d0184b3b55084fcddca5ea.tar.xz nixlib-12f95f75726ded0807d0184b3b55084fcddca5ea.tar.zst nixlib-12f95f75726ded0807d0184b3b55084fcddca5ea.zip | |
mariadb: remove c++11 narrowing error patch
Diffstat (limited to 'pkgs/servers/sql')
| -rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/sql/mariadb/fix-c++11-narrowing-error.patch | 13 |
2 files changed, 1 insertions, 18 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index d10b0fbc37b0..2f923116b2bf 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -53,11 +53,7 @@ common = rec { # attributes common to both builds patches = [ ./cmake-includedir.patch ./cmake-libmariadb-includedir.patch - ] ++ optionals stdenv.isDarwin [ - # Derived from "Fixed c++11 narrowing error" - # https://github.com/MariaDB/server/commit/a0dfefb0f8a47145e599a5f1b0dc576fa7634b92 - ./fix-c++11-narrowing-error.patch - ]; + ]; cmakeFlags = [ "-DBUILD_CONFIG=mysql_release" diff --git a/pkgs/servers/sql/mariadb/fix-c++11-narrowing-error.patch b/pkgs/servers/sql/mariadb/fix-c++11-narrowing-error.patch deleted file mode 100644 index 7399d8e39275..000000000000 --- a/pkgs/servers/sql/mariadb/fix-c++11-narrowing-error.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/sql/table.cc b/sql/table.cc -index e46af771507..9bef21a1da2 100644 ---- a/sql/table.cc -+++ b/sql/table.cc -@@ -8814,7 +8814,7 @@ bool TR_table::update(ulonglong start_id, ulonglong end_id) - - store(FLD_BEGIN_TS, thd->transaction_time()); - thd->set_time(); -- timeval end_time= {thd->query_start(), long(thd->query_start_sec_part())}; -+ timeval end_time= {thd->query_start(), int(thd->query_start_sec_part())}; - store(FLD_TRX_ID, start_id); - store(FLD_COMMIT_ID, end_id); - store(FLD_COMMIT_TS, end_time); |