mariadb: 10.3.22 -> 10.4.12 #86900

Izorkin · 2020-05-05T07:56:50Z

Motivation for this change

Upgrade MariaDB server to 10.4.12

cc @thoughtpolice @flokli @aanderse @dasJ

Things done

aanderse

Thank you for doing this @Izorkin!

pkgs/servers/sql/mariadb/cmake-disable-auth-pam-testing.patch

nixos/doc/manual/release-notes/rl-2009.xml

pkgs/servers/sql/mariadb/cmake-disable-auth-pam-testing.patch

nixos/modules/services/databases/mysql.nix

flokli

LGTM, but haven't tested it - especially the migration part, so would love to get some more feedback from people using this.

Izorkin · 2020-05-07T16:04:10Z

@GrahamcOfBorg test mariadb-galera-mariabackup

Izorkin · 2020-05-07T16:45:59Z

@GrahamcOfBorg test mysql-replication

Izorkin · 2020-05-07T17:26:43Z

Found errors with authentication.
https://mariadb.com/kb/en/authentication-from-mariadb-104

Izorkin · 2020-05-08T04:41:36Z

@GrahamcOfBorg test mariadb-galera-mariabackup
@GrahamcOfBorg test mariadb-galera-rsync
@GrahamcOfBorg test mysql
@GrahamcOfBorg test mysql-autobackup
@GrahamcOfBorg test mysql-backup
@GrahamcOfBorg test mysql-replication

aanderse · 2020-05-09T11:38:18Z

Test is failing on arm because TokuDB is unsupported plugin it looks like.

@flokli I'll upgrade a box or two this weekend to test this out, but we should be looking to merge early enough that our unstable users can catch any issues before 20.09.

Thank you very much for your hard work @Izorkin!

flokli · 2020-05-09T15:36:35Z

it seems ha_tokudb.so isn't part of the mysql output path:

[ERROR] mysqld: Can't open shared library '/nix/store/al7j8gzl8qjhh6fdiwjdh7bqyrrm911r-mariadb-server-10.4.12/lib/mysql/plugin/ha_tokudb.so' (errno: 22, cannot open shared object file: No such file or directory)

However, this is already the case on master (aarch64 and i686).

We might want to figure out why it's not available on these arches, and possibly update the test to only test tokudb where it's available, but this can be done in a follow-up PR.

aanderse

I upgraded a machine to this package, ran mysql_upgrade, and then tested some connections and programs out... everything worked fine 👍

Thanks again @Izorkin 🎉

nixos/doc/manual/release-notes/rl-2009.xml

aanderse

@flokli I suggest merge once the bot confirms everything. Any issue with that?

pkgs/top-level/all-packages.nix

nixos/tests/mysql/mariadb-galera-mariabackup.nix

nixos/doc/manual/release-notes/rl-2009.xml

flokli

A minor nitpick, otherwise should be fine for me now! Thanks for your work!

nixos/doc/manual/release-notes/rl-2009.xml

Izorkin · 2020-05-12T10:41:11Z

@GrahamcOfBorg test mariadb-galera-mariabackup
@GrahamcOfBorg test mariadb-galera-rsync
@GrahamcOfBorg test mysql
@GrahamcOfBorg test mysql-autobackup
@GrahamcOfBorg test mysql-backup
@GrahamcOfBorg test mysql-replication

Izorkin · 2020-05-12T12:48:37Z

@GrahamcOfBorg test mariadb-galera-mariabackup
@GrahamcOfBorg test mariadb-galera-rsync
@GrahamcOfBorg test mysql
@GrahamcOfBorg test mysql-autobackup
@GrahamcOfBorg test mysql-backup
@GrahamcOfBorg test mysql-replication

flokli

Why is this now built with another protobuf? I'm missing the explanation here.

Izorkin · 2020-05-13T14:51:28Z

With protobuf 3.8 mysql 5.7 anf 8.0 error build:

In file included from /build/mysql-5.7.27/rapid/plugin/x/ngs/include/ngs/protocol/message.h:24,
                 from /build/mysql-5.7.27/rapid/plugin/x/ngs/include/ngs/protocol_encoder.h:23,
                 from /build/mysql-5.7.27/rapid/plugin/x/ngs/include/ngs/client_session.h:24,
                 from /build/mysql-5.7.27/rapid/plugin/x/src/xpl_session.h:25,
                 from /build/mysql-5.7.27/rapid/plugin/x/src/xpl_plugin.cc:23:
/build/mysql-5.7.27/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h:32:10: fatal error: google/protobuf/wire_format_lite_inl.h: No such file or directory
   32 | #include <google/protobuf/wire_format_lite_inl.h>
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
make[2]: *** [rapid/plugin/x/CMakeFiles/mysqlx.dir/build.make:203: rapid/plugin/x/CMakeFiles/mysqlx.dir/src/xpl_plugin.cc.o] Error 1
make[2]: *** Waiting for unfinished jobs....

flokli · 2020-05-14T14:27:30Z

Please name the last commit message like this:

mysql57, mysql80: build with protobuf 3.7

They fail to build with protobuf 3.8:

In file included from /build/mysql-5.7.27/rapid/plugin/x/ngs/include/ngs/protocol/message.h:24,
                 from /build/mysql-5.7.27/rapid/plugin/x/ngs/include/ngs/protocol_encoder.h:23,
                 from /build/mysql-5.7.27/rapid/plugin/x/ngs/include/ngs/client_session.h:24,
                 from /build/mysql-5.7.27/rapid/plugin/x/src/xpl_session.h:25,
                 from /build/mysql-5.7.27/rapid/plugin/x/src/xpl_plugin.cc:23:
/build/mysql-5.7.27/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h:32:10: fatal error: google/protobuf/wire_format_lite_inl.h: No such file or directory
   32 | #include <google/protobuf/wire_format_lite_inl.h>
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
make[2]: *** [rapid/plugin/x/CMakeFiles/mysqlx.dir/build.make:203: rapid/plugin/x/CMakeFiles/mysqlx.dir/src/xpl_plugin.cc.o] Error 1
make[2]: *** Waiting for unfinished jobs....

MariaDB 10.4 introduces a number of changes to the authentication process, intended to make things easier and more intuitive.

They fail to build with protobuf 3.8: In file included from /build/mysql-5.7.27/rapid/plugin/x/ngs/include/ngs/protocol/message.h:24, from /build/mysql-5.7.27/rapid/plugin/x/ngs/include/ngs/protocol_encoder.h:23, from /build/mysql-5.7.27/rapid/plugin/x/ngs/include/ngs/client_session.h:24, from /build/mysql-5.7.27/rapid/plugin/x/src/xpl_session.h:25, from /build/mysql-5.7.27/rapid/plugin/x/src/xpl_plugin.cc:23: /build/mysql-5.7.27/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h:32:10: fatal error: google/protobuf/wire_format_lite_inl.h: No such file or directory 32 | #include <google/protobuf/wire_format_lite_inl.h> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. make[2]: *** [rapid/plugin/x/CMakeFiles/mysqlx.dir/build.make:203: rapid/plugin/x/CMakeFiles/mysqlx.dir/src/xpl_plugin.cc.o] Error 1 make[2]: *** Waiting for unfinished jobs....

Izorkin · 2020-05-14T14:30:57Z

Updated and rebased.

flokli · 2020-05-14T15:33:16Z

Built all mysql/mariadb attributes I could find, and ran the mysql, mysql-replication and mysql-autobackup tests.

ofborg bot added 6.topic: nixos 8.has: changelog 8.has: documentation 8.has: module (update) 8.has: clean-up 8.has: package (new) labels May 5, 2020

ofborg bot requested a review from thoughtpolice May 5, 2020 08:04

ofborg bot added 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 labels May 5, 2020

aanderse reviewed May 5, 2020

View reviewed changes

pkgs/servers/sql/mariadb/cmake-disable-auth-pam-testing.patch Show resolved Hide resolved

flokli requested changes May 5, 2020

View reviewed changes

nixos/doc/manual/release-notes/rl-2009.xml Outdated Show resolved Hide resolved

pkgs/servers/sql/mariadb/cmake-disable-auth-pam-testing.patch Show resolved Hide resolved

nixos/modules/services/databases/mysql.nix Show resolved Hide resolved

Izorkin force-pushed the mariadb-update branch from 4b9ec8f to d8f2dff Compare May 5, 2020 11:39

flokli reviewed May 5, 2020

View reviewed changes

flokli approved these changes May 5, 2020

View reviewed changes

Izorkin marked this pull request as draft May 7, 2020 17:22

Izorkin force-pushed the mariadb-update branch 2 times, most recently from bc59a9c to 861daa3 Compare May 7, 2020 19:55

Izorkin marked this pull request as ready for review May 7, 2020 19:55

Izorkin requested review from aanderse and flokli May 7, 2020 19:56

Izorkin force-pushed the mariadb-update branch 2 times, most recently from cc7c88f to a3c26a6 Compare May 7, 2020 20:42

aanderse approved these changes May 10, 2020

View reviewed changes

nixos/doc/manual/release-notes/rl-2009.xml Show resolved Hide resolved

Izorkin force-pushed the mariadb-update branch from a3c26a6 to 2bd967f Compare May 10, 2020 12:50

aanderse approved these changes May 10, 2020

View reviewed changes

flokli reviewed May 10, 2020

View reviewed changes

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

flokli reviewed May 10, 2020

View reviewed changes

nixos/tests/mysql/mariadb-galera-mariabackup.nix Show resolved Hide resolved

Izorkin force-pushed the mariadb-update branch 2 times, most recently from c128f0f to e733611 Compare May 10, 2020 19:22

flokli requested changes May 11, 2020

View reviewed changes

nixos/doc/manual/release-notes/rl-2009.xml Show resolved Hide resolved

Izorkin force-pushed the mariadb-update branch from e733611 to 1dc6494 Compare May 12, 2020 09:39

flokli requested changes May 12, 2020

View reviewed changes

nixos/doc/manual/release-notes/rl-2009.xml Outdated Show resolved Hide resolved

Izorkin force-pushed the mariadb-update branch from 1dc6494 to c692536 Compare May 12, 2020 10:14

Izorkin force-pushed the mariadb-update branch from 0514a3a to 9bebb71 Compare May 12, 2020 12:24

flokli reviewed May 13, 2020

View reviewed changes

Izorkin added 9 commits May 14, 2020 17:29

mariadb-galera: 25.3.27 -> 26.4.3

a40a811

mariadb: 10.3.22 -> 10.4.12

6ac9a9f

nixos/mysql: disable load pluginx auth_socket in mariadb

b8c8e81

nixos/mysql: add release notes

a4c7e0f

nixos/tests/mariadb-galera-mariabackup: fix test script

963259d

MariaDB 10.4 introduces a number of changes to the authentication process, intended to make things easier and more intuitive.

nixos/tests/mariadb-galera-rsync: fix test script

90f3003

MariaDB 10.4 introduces a number of changes to the authentication process, intended to make things easier and more intuitive.

nixos/tests/mysql-replication: fix test script

f52700f

MariaDB 10.4 introduces a number of changes to the authentication process, intended to make things easier and more intuitive.

nixos/mysql-replication: ignore system databases in binary log

da08b22

Izorkin force-pushed the mariadb-update branch from 9bebb71 to dde9810 Compare May 14, 2020 14:30

flokli merged commit 3d60859 into NixOS:master May 14, 2020

Izorkin deleted the mariadb-update branch May 14, 2020 15:36

aanderse mentioned this pull request May 14, 2020

mariadb: 10.3.20 -> 10.4.10 #74486

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

mariadb: 10.3.22 -> 10.4.12 #86900

mariadb: 10.3.22 -> 10.4.12 #86900

Izorkin commented May 5, 2020

aanderse left a comment

flokli left a comment

Izorkin commented May 7, 2020

Izorkin commented May 7, 2020

Izorkin commented May 7, 2020

Izorkin commented May 8, 2020

aanderse commented May 9, 2020

flokli commented May 9, 2020

aanderse left a comment

aanderse left a comment

flokli left a comment

Izorkin commented May 12, 2020

Izorkin commented May 12, 2020

flokli left a comment

Izorkin commented May 13, 2020

flokli commented May 14, 2020

Izorkin commented May 14, 2020

flokli commented May 14, 2020

mariadb: 10.3.22 -> 10.4.12 #86900

mariadb: 10.3.22 -> 10.4.12 #86900

Conversation

Izorkin commented May 5, 2020

Motivation for this change

Things done

aanderse left a comment

Choose a reason for hiding this comment

flokli left a comment

Choose a reason for hiding this comment

Izorkin commented May 7, 2020

Izorkin commented May 7, 2020

Izorkin commented May 7, 2020

Izorkin commented May 8, 2020

aanderse commented May 9, 2020

flokli commented May 9, 2020

aanderse left a comment

Choose a reason for hiding this comment

aanderse left a comment

Choose a reason for hiding this comment

flokli left a comment

Choose a reason for hiding this comment

Izorkin commented May 12, 2020

Izorkin commented May 12, 2020

flokli left a comment

Choose a reason for hiding this comment

Izorkin commented May 13, 2020

flokli commented May 14, 2020

Izorkin commented May 14, 2020

flokli commented May 14, 2020