mariadb: 10.2.17 -> 10.3.15 #44343

Izorkin · 2018-08-02T09:14:23Z

Motivation for this change

The goal for the split is to avoid duplicating binary files in client and server packages. Change default codepage to utf8mb4. Additional improvements.

Things done

Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
Built on platform(s)
- NixOS
- macOS
- other Linux distributions
Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
Tested execution of all binary files (usually in ./result/bin/)
Determined the impact on package closure size (by running nix path-info -S before and after)
Fits CONTRIBUTING.md.

jtojnar · 2018-08-02T12:06:23Z

pkgs/servers/sql/mariadb/default.nix


  patches = [ ./cmake-includedir.patch ./include-dirs-path.patch ]
    ++ stdenv.lib.optional stdenv.cc.isClang ./clang-isfinite.patch;

  cmakeFlags = [
    "-DBUILD_CONFIG=mysql_release"
+    "-DCMAKE_BUILD_TYPE=Release"


This should already be the default. (see cmake setup hook)

jtojnar · 2018-08-02T12:11:36Z

It would be nice if you could split the changeset to multiple commits, it is pretty hard to wrap my head around all those changes. Also why are you removing the comments?

Izorkin · 2018-08-02T13:15:49Z

Comments were removed by mistake.I will try to fix and split the PR to separate commits soon.

Izorkin · 2018-08-02T19:02:03Z

Changed PR. Please check.

Mic92 · 2018-08-04T08:03:23Z

pkgs/servers/sql/mariadb/default.nix

@@ -50,8 +50,8 @@ common = rec { # attributes common to both builds
  cmakeFlags = [
    "-DBUILD_CONFIG=mysql_release"
    "-DMANUFACTURER=NixOS.org"
-    "-DDEFAULT_CHARSET=utf8"
-    "-DDEFAULT_COLLATION=utf8_general_ci"
+    "-DDEFAULT_CHARSET=utf8mb4"


For those who wonder what the difference is: https://stackoverflow.com/questions/30074492/what-is-the-difference-between-utf8mb4-and-utf8-charsets-in-mysql

Mic92 · 2018-08-04T08:08:44Z

pkgs/servers/sql/mariadb/default.nix

+  postInstall = ''
+    rm -r "$out"/share/mysql
+    rm -r "$out"/share/doc/mysql/{policy,systemd}
+    rm "$out"/bin/{galera_new_cluster,galera_recovery,mariadb-service-convert,msql2mysql,my_print_defaults,mysql_convert_table_format,mysqld_safe_helper,mysql_install_db,mysql_plugin,mysql_secure_installation,mysql_setpermission,mysql_upgrade,mytop,perror,replace,resolveip,resolve_stack_dump,wsrep_sst_rsync_wan,mysql_config,mariadb_config}


Can you wrap or split long lines for readability?

matthewbauer · 2018-08-08T00:13:55Z

pkgs/servers/sql/mariadb/default.nix

@@ -224,7 +216,7 @@ galera = stdenv.mkDerivation rec {
  version = "25.3.23";

  src = fetchurl {
-    url = "https://mirrors.nxthost.com/mariadb/mariadb-10.2.14/galera-${version}/src/galera-${version}.tar.gz";
+    url = "https://mirrors.nxthost.com/mariadb/mariadb-10.3.8/galera-${version}/src/galera-${version}.tar.gz";


Does the old url not work anymore?

Working. Just changed the link to the current version MariaDB

So it's a version update? If so you also need to update the hash, and mark it as such in the commit message

No, these are identical versions.

orivej · 2018-08-13T19:48:29Z

pkgs/servers/sql/mariadb/default.nix

    "-DSECURITY_HARDENED=ON"

-    "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
+    "-DINSTALL_UNIX_ADDRDIR=/run/mysqld/mysqld.sock"


Is this correct? mysqld.sock is a socket file, not a directory (as suggested by the name ADDRDIR).

Yes. If not specified "MYSQL_UNIX_ADDR" is used INSTALL_UNIX_ADDRDIR
https://github.com/MariaDB/server/blob/10.3/cmake/install_layout.cmake#L252-L254

Izorkin · 2018-08-13T20:21:02Z

MariaDB revert to 10.2.16 - 4c45016
Need reupdate PR?

vcunat · 2018-08-18T11:09:19Z

pkgs/servers/sql/mariadb/default.nix

@@ -98,28 +96,26 @@ common = rec { # attributes common to both builds
 client = stdenv.mkDerivation (common // {
  name = "mariadb-client-${common.version}";

-  outputs = [ "bin" "dev" "out" ];
+  outputs = [ "dev" "out" "man" ];


This is a non-standard output order; I would expect "out" to be first in this set. https://nixos.org/nixpkgs/manual/#multiple-output-file-binaries-first-convention (same again below)

Izorkin · 2019-04-14T05:37:28Z

Current variant - https://github.com/Izorkin/nur-packages/blob/master/pkgs/servers/mariadb/default.nix

Izorkin · 2019-04-15T05:07:19Z

@bobvanderlinden in master branch - 10.2.17 version
https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/sql/mariadb/default.nix#L25

aanderse · 2019-05-19T10:48:59Z

@Izorkin I think you're having trouble finding 1 person willing to merge each of these changes. Some of these changes individually aren't a big deal to merge, but all together at the same time make it difficult to be certain regressions aren't introduced. If this was broken into several PRs I'm guessing at least a few of the new PRs would be merged much sooner than this individual PR would be. Merging the contents of this PR spread out over several PRs over a period of time would likely also help tracking down any potential regressions that might arise from this much quicker.

Just my 2 cents.

Izorkin · 2019-05-19T10:53:17Z

@aanderse see #44343 (comment)
I can squashed in 1 PR.

aanderse · 2019-05-19T10:56:42Z

@Izorkin multiple commits was an improvement... but I wonder if you might need to go as far as multiple commits to get some action on this.

You are doing quite a few things in a single PR and I just wonder if you're making too many changes at once so no one is comfortable enough to merge all the changes at once.

I don't speak for others, I just wonder if they feel that way.

Izorkin · 2019-05-19T10:58:59Z

Simplify PR to, for example, 5 commits?

aanderse · 2019-05-19T11:03:12Z

You might consider creating a PR to change the default code page, a PR to bump the version, and a PR to apply some cleanup.

Izorkin · 2019-05-19T13:07:46Z

Reconfigured and updated to 10.3.15

Izorkin · 2019-05-19T13:08:47Z

@GrahamcOfBorg build mariadb.server mariadb.client
@GrahamcOfBorg test mysql mysqlBackup mysqlReplication

pkgs/top-level/all-packages.nix

Izorkin · 2019-06-04T16:03:15Z

Updated PR.

Izorkin · 2019-06-04T16:30:38Z

Thanks!

The 10.2 → 10.3 upgrade (NixOS#44343) broke it

Izorkin mentioned this pull request Aug 2, 2018

[WIP] mariadb: add v10.3.8 #44241

Closed

9 tasks

Izorkin force-pushed the mariadb-10.3 branch from c6750a0 to 2dcaa5e Compare August 2, 2018 09:21

Izorkin changed the title ~~mariadb: fix build client and refactor config~~ mariadb: fix build client and change config Aug 2, 2018

GrahamcOfBorg added 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+ labels Aug 2, 2018

jtojnar reviewed Aug 2, 2018

View reviewed changes

Izorkin force-pushed the mariadb-10.3 branch from 2dcaa5e to 4b1cece Compare August 2, 2018 18:57

Izorkin force-pushed the mariadb-10.3 branch from 4b1cece to e0bb2a8 Compare August 2, 2018 19:04

Mic92 reviewed Aug 4, 2018

View reviewed changes

Izorkin force-pushed the mariadb-10.3 branch from e0bb2a8 to 7e741f9 Compare August 4, 2018 08:25

matthewbauer reviewed Aug 8, 2018

View reviewed changes

orivej reviewed Aug 13, 2018

View reviewed changes

vcunat reviewed Aug 18, 2018

View reviewed changes

GrahamcOfBorg added 2.status: merge conflict and removed 2.status: merge conflict labels Aug 19, 2018

Izorkin changed the title ~~mariadb: fix build client and change config~~ mariadb: update to 10.3.9 Aug 19, 2018

Mic92 changed the title ~~mariadb: update to 10.3.9~~ mariadb: 10.2.17 -> 10.3.9 Aug 23, 2018

Izorkin force-pushed the mariadb-10.3 branch from 8e62879 to 5a4c5c3 Compare August 30, 2018 10:10

GrahamcOfBorg added 2.status: merge conflict and removed 2.status: merge conflict labels Aug 30, 2018

Izorkin force-pushed the mariadb-10.3 branch from 743587e to 8d4726d Compare October 5, 2018 05:09

Izorkin changed the title ~~mariadb: 10.2.17 -> 10.3.9~~ mariadb: 10.2.17 -> 10.3.10 Oct 5, 2018

GrahamcOfBorg added 2.status: merge conflict and removed 2.status: merge conflict labels Oct 5, 2018

Izorkin force-pushed the mariadb-10.3 branch from eca533c to 8d4726d Compare October 6, 2018 17:34

Izorkin added 3 commits May 19, 2019 16:06

mariadb: change server config

1db3a91

mariadb: change client config

3a6e362

mariadb: change default codepage to utf8mb4

c9d2d2f

Izorkin force-pushed the mariadb-10.3 branch from 68ba646 to d1ee4b7 Compare May 19, 2019 13:07

Izorkin changed the title ~~mariadb: 10.2.17 -> 10.3.12~~ mariadb: 10.2.17 -> 10.3.15 May 19, 2019

ofborg bot added 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100 and removed 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+ labels May 19, 2019

nh2 reviewed Jun 4, 2019

View reviewed changes

pkgs/top-level/all-packages.nix Show resolved Hide resolved

mariadb: 10.2.17 -> 10.3.15

a3da901

Izorkin force-pushed the mariadb-10.3 branch from d1ee4b7 to a3da901 Compare June 4, 2019 16:02

matthewbauer merged commit 75a82b5 into NixOS:master Jun 4, 2019

Izorkin deleted the mariadb-10.3 branch June 4, 2019 16:30

ajs124 mentioned this pull request Jun 9, 2019

exim: Fix build with MariaDB #62888

Merged

10 tasks

ajs124 added a commit to ajs124/nixpkgs that referenced this pull request Jun 14, 2019

exim: Fix build with MariaDB

d354416

The 10.2 → 10.3 upgrade (NixOS#44343) broke it

schneefux mentioned this pull request Jul 2, 2019

Where did mysqldump go? #64132

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

mariadb: 10.2.17 -> 10.3.15 #44343

mariadb: 10.2.17 -> 10.3.15 #44343

Izorkin commented Aug 2, 2018 •

edited

jtojnar Aug 2, 2018

jtojnar commented Aug 2, 2018 •

edited

Izorkin commented Aug 2, 2018

Izorkin commented Aug 2, 2018

Mic92 Aug 4, 2018

Mic92 Aug 4, 2018

Izorkin Aug 4, 2018

matthewbauer Aug 8, 2018

Izorkin Aug 8, 2018

infinisil Aug 13, 2018

Izorkin Aug 13, 2018

orivej Aug 13, 2018

Izorkin Aug 13, 2018

Izorkin commented Aug 13, 2018

vcunat Aug 18, 2018 •

edited

Izorkin commented Apr 14, 2019

Izorkin commented Apr 15, 2019

aanderse commented May 19, 2019

Izorkin commented May 19, 2019

aanderse commented May 19, 2019

Izorkin commented May 19, 2019

aanderse commented May 19, 2019

Izorkin commented May 19, 2019

Izorkin commented May 19, 2019

Izorkin commented Jun 4, 2019

Izorkin commented Jun 4, 2019

mariadb: 10.2.17 -> 10.3.15 #44343

mariadb: 10.2.17 -> 10.3.15 #44343

Conversation

Izorkin commented Aug 2, 2018 • edited

Motivation for this change

Things done

Choose a reason for hiding this comment

jtojnar commented Aug 2, 2018 • edited

Izorkin commented Aug 2, 2018

Izorkin commented Aug 2, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Izorkin commented Aug 13, 2018

vcunat Aug 18, 2018 • edited

Choose a reason for hiding this comment

Izorkin commented Apr 14, 2019

Izorkin commented Apr 15, 2019

aanderse commented May 19, 2019

Izorkin commented May 19, 2019

aanderse commented May 19, 2019

Izorkin commented May 19, 2019

aanderse commented May 19, 2019

Izorkin commented May 19, 2019

Izorkin commented May 19, 2019

Izorkin commented Jun 4, 2019

Izorkin commented Jun 4, 2019

Izorkin commented Aug 2, 2018 •

edited

jtojnar commented Aug 2, 2018 •

edited

vcunat Aug 18, 2018 •

edited