mariadb: 10.3.15 -> 10.3.17 #63355

Izorkin · 2019-06-17T17:32:10Z

Motivation for this change

Update MariaDB to 10.3.16
Changelog - https://mariadb.com/kb/en/library/mariadb-10316-changelog/

Move mariadb_config and mysql_config to $dev output.
Move mysql binary to mysql.client

Fixed mysql_config output
before PR

Usage: ./result/bin/mysql_config [OPTIONS]
Options:
        --cflags         [-I/nix/store/63l1lwz19lj4mw03m2ra7m1vnylp8xxl-mariadb-10.3.15/include/mysql -I/nix/store/63l1lwz19lj4mw03m2ra7m1vnylp8xxl-mariadb-10.3.15/include/mysql/mysql]
        --include        [-I/nix/store/63l1lwz19lj4mw03m2ra7m1vnylp8xxl-mariadb-10.3.15/include/mysql -I/nix/store/63l1lwz19lj4mw03m2ra7m1vnylp8xxl-mariadb-10.3.15/include/mysql/mysql]
        --libs           [-L/nix/store/63l1lwz19lj4mw03m2ra7m1vnylp8xxl-mariadb-10.3.15/lib/ -lmariadb -lz -ldl -lm -lpthread -lssl -lcrypto]
        --libs_r         [-L/nix/store/63l1lwz19lj4mw03m2ra7m1vnylp8xxl-mariadb-10.3.15/lib/ -lmariadb -lz -ldl -lm -lpthread -lssl -lcrypto]
        --plugindir      [/nix/store/63l1lwz19lj4mw03m2ra7m1vnylp8xxl-mariadb-10.3.15/lib/mysql/plugin]
        --socket         [/run/mysqld/mysqld.sock]
        --port           [3306]
        --version        [10.3.15]
        --libmysqld-libs [-L/home/home/works/src-nix/nixpkgs/result/lib/mysql  -lmysqld]
        --variable=VAR   VAR is one of:
                pkgincludedir [/nix/store/63l1lwz19lj4mw03m2ra7m1vnylp8xxl-mariadb-10.3.15/include/mysql]
                pkglibdir     [/home/home/works/src-nix/nixpkgs/result/lib/mysql]
                plugindir     [/nix/store/63l1lwz19lj4mw03m2ra7m1vnylp8xxl-mariadb-10.3.15/lib/mysql/plugin]

After:

Usage: ./result-dev/bin/mysql_config [OPTIONS]
Options:
        --cflags         [-I/nix/store/w9569b5rpvnma3iz55il9y6hwbpi2sgq-mariadb-client-10.3.16-dev/include/mysql -I/nix/store/w9569b5rpvnma3iz55il9y6hwbpi2sgq-mariadb-client-10.3.16-dev/include/mysql/mysql]
        --include        [-I/nix/store/w9569b5rpvnma3iz55il9y6hwbpi2sgq-mariadb-client-10.3.16-dev/include/mysql -I/nix/store/w9569b5rpvnma3iz55il9y6hwbpi2sgq-mariadb-client-10.3.16-dev/include/mysql/mysql]
        --libs           [-L/nix/store/w9569b5rpvnma3iz55il9y6hwbpi2sgq-mariadb-client-10.3.16-dev/lib/mysql/ -lmariadb -lz -ldl -lm -lpthread -lssl -lcrypto]
        --libs_r         [-L/nix/store/w9569b5rpvnma3iz55il9y6hwbpi2sgq-mariadb-client-10.3.16-dev/lib/mysql/ -lmariadb -lz -ldl -lm -lpthread -lssl -lcrypto]
        --plugindir      [/nix/store/w9569b5rpvnma3iz55il9y6hwbpi2sgq-mariadb-client-10.3.16-dev/lib/mysql/plugin]
        --socket         [/run/mysqld/mysqld.sock]
        --port           [3306]
        --version        [10.3.16]
        --libmysqld-libs [-L/home/home/works/src-nix/nixpkgs/result-dev/lib/mysql  -lmysqld]
        --variable=VAR   VAR is one of:
                pkgincludedir [/home/home/works/src-nix/nixpkgs/result-dev/include/mysql]
                pkglibdir     [/home/home/works/src-nix/nixpkgs/result-dev/lib/mysql]
                plugindir     [/nix/store/w9569b5rpvnma3iz55il9y6hwbpi2sgq-mariadb-client-10.3.16-dev/lib/mysql/plugin]

Things done

Izorkin · 2019-06-17T19:54:07Z

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

Izorkin · 2019-06-17T20:11:20Z

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

matthewbauer · 2019-06-21T17:32:12Z

Looks okay, but I want to make sure x86_64-darwin builds.

@GrahamcOfBorg build mariadb.client mariadb.server

pkgs/servers/sql/mariadb/cmake-libmariadb-includedir.patch

Izorkin · 2019-06-21T17:34:51Z

@matthewbauer need upgrade MariaDB to version 10.4.6 - current stable release?

Izorkin · 2019-06-21T17:43:21Z

Do you need these binaries:

mysql_client_test
mytop (not worked)
mysqltest

Izorkin · 2019-06-21T19:21:16Z

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

Izorkin · 2019-07-02T16:42:59Z

added release notes

Izorkin · 2019-08-01T17:31:39Z

@GrahamcOfBorg build mariadb.client mariadb.server

Izorkin · 2019-08-01T17:43:07Z

@GrahamcOfBorg build mariadb.connector-c_3_1

Mic92 · 2019-08-01T23:06:30Z

@GrahamcOfBorg build mariadb.connector-c_3_1

Izorkin · 2019-08-02T04:52:28Z

@GrahamcOfBorg build mariadb.connector-c_3_1

Mic92 · 2019-08-02T07:58:38Z

@GrahamcOfBorg build mariadb.connector-c_3_1

Izorkin · 2019-08-02T08:39:21Z

@GrahamcOfBorg build mariadb.connector-c_3_1 mariadb.client mariadb.server

Mic92 · 2019-08-02T09:03:22Z

@GrahamcOfBorg build mariadb.connector-c_3_1 mariadb.client mariadb.server

Izorkin · 2019-08-02T09:41:16Z

@GrahamcOfBorg build mariadb.connector-c_3_1

Izorkin · 2019-08-02T09:49:46Z

@GrahamcOfBorg build mariadb.client

Mic92 · 2019-08-02T10:04:28Z

@GrahamcOfBorg build mariadb.client

Izorkin · 2019-08-02T10:23:08Z

@GrahamcOfBorg build mariadb.client mariadb.server

Mic92 · 2019-08-02T10:24:29Z

@GrahamcOfBorg build mariadb.client mariadb.server

Izorkin · 2019-08-02T10:34:20Z

@GrahamcOfBorg build mariadb.client mariadb.server

Mic92 · 2019-08-02T11:46:50Z

@GrahamcOfBorg build mariadb.client mariadb.server

Izorkin · 2019-08-02T13:55:27Z

Thanks!

orivej · 2019-08-15T10:27:30Z

Why did you move libmysqlclient.so from lib to lib/mysql? It seems wrong.

orivej · 2019-08-15T10:31:52Z

pkgs/servers/sql/mariadb/cmake-libmariadb-includedir.patch

+-#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql"
+-#define LIBS    "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb"
+#define INCLUDE "-I@CMAKE_INSTALL_PREFIX_DEV@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX_DEV@/@INSTALL_INCLUDEDIR@/mysql"
+#define LIBS    "-L@CMAKE_INSTALL_PREFIX_DEV@/@INSTALL_LIBDIR@/ -lmariadb"


This makes mariadb_config --libs list the directory with static libraries.

But how should it be?
Now mariadb.connector-c is used instead of mariadb.client.dev

Izorkin · 2019-08-15T12:02:38Z

Why did you move libmysqlclient.so from lib to lib/mysql? It seems wrong.

In package mariadb.connector-c file libmysqlclient.so located in lib/mysql/

ls -lah ./result/lib/mysql/ | grep libmysqlclient.so 
lrwxrwxrwx 31 root root   13 янв  1  1970 libmysqlclient.so -> libmariadb.so

Made similarly here.
Or is it wrong?

orivej · 2019-08-15T12:27:59Z

I guess that connector-c default libdir is lib/mariadb while client default is lib to prevent file conflicts between their packages in traditional distros. Libraries in lib are more useful because they can be used without configuration.

Izorkin · 2019-08-15T13:08:28Z

@orivej use this patch?

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 7d34dd8d63b..d2935e0a936 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -68,7 +68,7 @@ common = rec { # attributes common to both builds
     "-DINSTALL_DOCDIR=share/doc/mysql"
     "-DINSTALL_DOCREADMEDIR=share/doc/mysql"
     "-DINSTALL_INCLUDEDIR=include/mysql"
-    "-DINSTALL_LIBDIR=lib/mysql"
+    "-DINSTALL_LIBDIR=lib"
     "-DINSTALL_PLUGINDIR=lib/mysql/plugin"
     "-DINSTALL_INFODIR=share/mysql/docs"
     "-DINSTALL_MANDIR=share/man"
@@ -97,7 +97,7 @@ common = rec { # attributes common to both builds
   postInstall = ''
     rm "$out"/lib/mysql/plugin/daemon_example.ini
     mkdir -p "$dev"/bin && mv "$out"/bin/{mariadb_config,mysql_config} "$dev"/bin
-    mkdir -p "$dev"/lib/mysql && mv "$out"/lib/mysql/{libmariadbclient.a,libmysqlclient.a,libmysqlclient_r.a,libmysqlservices.a} "$dev"/lib/mysql
+    mkdir -p "$dev"/lib/ && mv "$out"/lib/{libmariadbclient.a,libmysqlclient.a,libmysqlclient_r.a,libmysqlservices.a} "$dev"/lib
     mkdir -p "$dev"/lib/mysql/plugin && mv "$out"/lib/mysql/plugin/{caching_sha2_password.so,dialog.so,mysql_clear_password.so,sha256_password.so} "$dev"/lib/mysql/plugin
   '';

@@ -136,14 +136,13 @@ client = stdenv.mkDerivation (common // {
       -DCMAKE_INSTALL_PREFIX_DEV=$dev"
   '';

-  postInstall =  common.postInstall + ''
+  postInstall = common.postInstall + ''
     rm -r "$out"/share/doc
     rm "$out"/bin/{mysqltest,mytop,wsrep_sst_rsync_wan}
-    libmysqlclient_path=$(readlink -f $out/lib/mysql/libmysqlclient${libExt})
-    rm "$out"/lib/mysql/{libmariadb${libExt},libmysqlclient${libExt},libmysqlclient_r${libExt}}
-    mv "$libmysqlclient_path" "$out"/lib/mysql/libmysqlclient${libExt}
-    ln -sv libmysqlclient${libExt} "$out"/lib/mysql/libmysqlclient_r${libExt}
-
+    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}
   '';
 });

@@ -166,7 +165,6 @@ server = stdenv.mkDerivation (common // {

   cmakeFlags = common.cmakeFlags ++ [
     "-DMYSQL_DATADIR=/var/lib/mysql"
-    "-DINSTALL_PLUGINDIR=lib/mysql/plugin"
     "-DENABLED_LOCAL_INFILE=OFF"
     "-DWITH_READLINE=ON"
     "-DWITH_EXTRA_CHARSETS=all"
@@ -196,7 +194,7 @@ server = stdenv.mkDerivation (common // {
     chmod +x "$out"/bin/wsrep_sst_common
     rm "$out"/bin/mysql_client_test
     rm -r "$out"/data # Don't need testing data
-    rm "$out"/lib/mysql/{libmysqlclient${libExt},libmysqlclient_r${libExt}}
+    rm "$out"/lib/{libmysqlclient${libExt},libmysqlclient_r${libExt}}
     mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql
   '' + optionalString withoutClient ''
     ${ # We don't build with GSSAPI on Darwin

orivej · 2019-08-15T13:25:03Z

mariadb (and mysql) defines a set of install layouts: standalone, rpm, deb, svr4: https://github.com/MariaDB/server/blob/ae4b9b76/cmake/install_layout.cmake#L76 . We configure it as standalone, which is meant for read-writable single directory installations, but then override standalone defaults towards deb, which is closer to what we need in nixpkgs. deb installs libs in lib and plugins in lib/mysql/plugin: https://github.com/MariaDB/server/blob/ae4b9b76/cmake/install_layout.cmake#L177-L178 .

I suppose that it would be easier for us to switch the base layout to deb, but meanwhile its fine to tweak standalone to be more like deb and use lib and lib/mysql/plugin.

Izorkin · 2019-08-15T14:09:28Z

@orivej updated patch

Izorkin · 2019-08-15T17:54:02Z

@orivej create new PR with this patch?

ofborg bot requested a review from thoughtpolice June 17, 2019 17:53

ofborg bot added 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100 labels Jun 17, 2019

Izorkin force-pushed the mariadb-10.3 branch from 2437dd8 to 4d7bea0 Compare June 17, 2019 19:47

Izorkin force-pushed the mariadb-10.3 branch from 4d7bea0 to e2af82a Compare June 17, 2019 20:11

Izorkin force-pushed the mariadb-10.3 branch 3 times, most recently from 78652c3 to 8626e15 Compare June 20, 2019 21:48

matthewbauer reviewed Jun 21, 2019

View reviewed changes

pkgs/servers/sql/mariadb/cmake-libmariadb-includedir.patch Outdated Show resolved Hide resolved

ofborg bot added 6.topic: nixos 8.has: changelog 8.has: documentation labels Jul 2, 2019

Izorkin force-pushed the mariadb-10.3 branch 2 times, most recently from e3c4a47 to 8d42180 Compare July 21, 2019 06:42

ofborg bot removed 6.topic: nixos 8.has: changelog 8.has: documentation labels Jul 21, 2019

Izorkin force-pushed the mariadb-10.3 branch 3 times, most recently from 8ac2a6e to 673d6c4 Compare July 21, 2019 06:56

ofborg bot added 6.topic: nixos 8.has: changelog 8.has: documentation labels Jul 21, 2019

Izorkin force-pushed the mariadb-10.3 branch from e9ab36c to 5b597f8 Compare August 2, 2019 09:49

Izorkin force-pushed the mariadb-10.3 branch from 5b597f8 to 0ac2bfd Compare August 2, 2019 10:22

mariadb: fix build in Darwin

21e891e

Izorkin force-pushed the mariadb-10.3 branch from 0ac2bfd to 21e891e Compare August 2, 2019 10:32

Mic92 merged commit c740bbf into NixOS:master Aug 2, 2019

Izorkin deleted the mariadb-10.3 branch August 2, 2019 13:55

orivej reviewed Aug 15, 2019

View reviewed changes

Izorkin mentioned this pull request Sep 12, 2019

mariadb: 10.3.17 -> 10.3.18 #68541

Merged

10 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

mariadb: 10.3.15 -> 10.3.17 #63355

mariadb: 10.3.15 -> 10.3.17 #63355

Izorkin commented Jun 17, 2019 •

edited

Izorkin commented Jun 17, 2019

Izorkin commented Jun 17, 2019

matthewbauer commented Jun 21, 2019

Izorkin commented Jun 21, 2019

Izorkin commented Jun 21, 2019

Izorkin commented Jun 21, 2019

Izorkin commented Jul 2, 2019

Izorkin commented Aug 1, 2019

Izorkin commented Aug 1, 2019

Mic92 commented Aug 1, 2019

Izorkin commented Aug 2, 2019

Mic92 commented Aug 2, 2019

Izorkin commented Aug 2, 2019

Mic92 commented Aug 2, 2019

Izorkin commented Aug 2, 2019

Izorkin commented Aug 2, 2019

Mic92 commented Aug 2, 2019

Izorkin commented Aug 2, 2019

Mic92 commented Aug 2, 2019

Izorkin commented Aug 2, 2019

Mic92 commented Aug 2, 2019

Izorkin commented Aug 2, 2019

orivej commented Aug 15, 2019

orivej Aug 15, 2019

Izorkin Aug 15, 2019

Izorkin commented Aug 15, 2019

orivej commented Aug 15, 2019

Izorkin commented Aug 15, 2019 •

edited

orivej commented Aug 15, 2019 •

edited

Izorkin commented Aug 15, 2019

Izorkin commented Aug 15, 2019

mariadb: 10.3.15 -> 10.3.17 #63355

mariadb: 10.3.15 -> 10.3.17 #63355

Conversation

Izorkin commented Jun 17, 2019 • edited

Motivation for this change

Things done

Izorkin commented Jun 17, 2019

Izorkin commented Jun 17, 2019

matthewbauer commented Jun 21, 2019

Izorkin commented Jun 21, 2019

Izorkin commented Jun 21, 2019

Izorkin commented Jun 21, 2019

Izorkin commented Jul 2, 2019

Izorkin commented Aug 1, 2019

Izorkin commented Aug 1, 2019

Mic92 commented Aug 1, 2019

Izorkin commented Aug 2, 2019

Mic92 commented Aug 2, 2019

Izorkin commented Aug 2, 2019

Mic92 commented Aug 2, 2019

Izorkin commented Aug 2, 2019

Izorkin commented Aug 2, 2019

Mic92 commented Aug 2, 2019

Izorkin commented Aug 2, 2019

Mic92 commented Aug 2, 2019

Izorkin commented Aug 2, 2019

Mic92 commented Aug 2, 2019

Izorkin commented Aug 2, 2019

orivej commented Aug 15, 2019

orivej Aug 15, 2019

Choose a reason for hiding this comment

Izorkin Aug 15, 2019

Choose a reason for hiding this comment

Izorkin commented Aug 15, 2019

orivej commented Aug 15, 2019

Izorkin commented Aug 15, 2019 • edited

orivej commented Aug 15, 2019 • edited

Izorkin commented Aug 15, 2019

Izorkin commented Aug 15, 2019

Izorkin commented Jun 17, 2019 •

edited

Izorkin commented Aug 15, 2019 •

edited

orivej commented Aug 15, 2019 •

edited