Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[20.03] mariadb: backport updates #84164

Merged
merged 7 commits into from Apr 3, 2020

Conversation

Izorkin
Copy link
Contributor

@Izorkin Izorkin commented Apr 3, 2020

Motivation for this change

Backport updates to 20.03

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Izorkin
Copy link
Contributor Author

Izorkin commented Apr 3, 2020

cc @flokli

@Izorkin
Copy link
Contributor Author

Izorkin commented Apr 3, 2020

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

@ofborg ofborg bot requested a review from thoughtpolice April 3, 2020 06:47
@flokli flokli requested review from aanderse and flokli April 3, 2020 12:31
@flokli flokli changed the title mariadb: backport updates to 20.03 [20.03] mariadb: backport updates Apr 3, 2020
@flokli flokli changed the base branch from nixos-20.03 to release-20.03 April 3, 2020 12:34
@flokli
Copy link
Contributor

flokli commented Apr 3, 2020

@Izorkin the PR was targeted against another branch, and now needs a rebase. I'm doing that now.

Izorkin and others added 7 commits April 3, 2020 14:47
(cherry picked from commit c6d159d)
(cherry picked from commit 982a23d)
When used as a global override, it breaks most of the options in the
mysql module, such as ensureDatabases, ensureUsers, initialDatabases,
initialScript.

We could use `.client` there, but if the reasoning behind this was
closure size reduction, we now end up with the same (or a bigger)
runtime closure and more complexity.

Apart from the options exposed by the mysql module, the client is also
likely to be required for local backups or DBA tasks anyways.

Instead of dealing with all the increased complexity of this for no
arguable benefit, let's just remove the `withoutClient` argument.
Storage space on mysql servers shouldn't be that much of an issue.

Closes NixOS#82428.

(cherry picked from commit 4b8d66a)
(cherry picked from commit 2435743)
(cherry picked from commit 5abc729)
@flokli
Copy link
Contributor

flokli commented Apr 3, 2020

Did that now, also had to manually add the

(cherry picked from commit …)

line usually created from the git cherry-pick -x parameter.

Pleas remember to always to backport cherrypicks with this parameter.

@Izorkin
Copy link
Contributor Author

Izorkin commented Apr 3, 2020

Pleas remember to always to backport cherrypicks with this parameter.

Sorry, i will try not to forget.

@flokli flokli merged commit e89b106 into NixOS:release-20.03 Apr 3, 2020
@Izorkin Izorkin deleted the mariadb-tokudb-20.03 branch April 3, 2020 14:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants