alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

mariadb: remove c++11 narrowing error patch

Browse source
This commit is contained in:
Izorkin 2019-08-01 19:41:57 +03:00
parent 0b8da0cbfb
commit 12f95f7572
2 changed files with 1 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/servers/sql/mariadb/default.nix
View file

@ -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"

13
pkgs/servers/sql/mariadb/fix-c++11-narrowing-error.patch
View file

@ -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);