Navigation Menu

Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: cbdbafd98fa3
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 3d60859dfb4c
Choose a head ref
  • 10 commits
  • 10 files changed
  • 2 contributors

Commits on May 14, 2020

  1. Copy the full SHA
    a40a811 View commit details
    Browse the repository at this point in the history
  2. mariadb: 10.3.22 -> 10.4.12

    Izorkin committed May 14, 2020
    Copy the full SHA
    6ac9a9f View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    b8c8e81 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    a4c7e0f View commit details
    Browse the repository at this point in the history
  5. nixos/tests/mariadb-galera-mariabackup: fix test script

    MariaDB 10.4 introduces a number of changes to the authentication
    process, intended to make things easier and more intuitive.
    Izorkin committed May 14, 2020
    Copy the full SHA
    963259d View commit details
    Browse the repository at this point in the history
  6. nixos/tests/mariadb-galera-rsync: fix test script

    MariaDB 10.4 introduces a number of changes to the authentication
    process, intended to make things easier and more intuitive.
    Izorkin committed May 14, 2020
    Copy the full SHA
    90f3003 View commit details
    Browse the repository at this point in the history
  7. nixos/tests/mysql-replication: fix test script

    MariaDB 10.4 introduces a number of changes to the authentication
    process, intended to make things easier and more intuitive.
    Izorkin committed May 14, 2020
    Copy the full SHA
    f52700f View commit details
    Browse the repository at this point in the history
  8. Copy the full SHA
    da08b22 View commit details
    Browse the repository at this point in the history
  9. 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....
    Izorkin committed May 14, 2020
    Copy the full SHA
    dde9810 View commit details
    Browse the repository at this point in the history
  10. Merge pull request #86900 from Izorkin/mariadb-update

    mariadb: 10.3.22 -> 10.4.12
    flokli committed May 14, 2020
    Copy the full SHA
    3d60859 View commit details
    Browse the repository at this point in the history