summaryrefslogtreecommitdiff
path: root/debian
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'bb-10.5-release' into bb-10.6-release10.6-halfmergeOleksandr Byelkin2021-02-161-0/+7
|\
| * Merge branch 'bb-10.4-release' into bb-10.5-releaseSergei Golubchik2021-02-151-0/+7
| |\
| | * Merge branch 'bb-10.3-release' into bb-10.4-releaseSergei Golubchik2021-02-121-0/+6
| | |\ | | | | | | | | | | | | | | | | Note, the fix for "MDEV-23328 Server hang due to Galera lock conflict resolution" was null-merged. 10.4 version of the fix is coming up separately
| | | * Merge branch '10.2' into 10.3Sergei Golubchik2021-02-011-0/+6
| | | |\
| | | | * Skip TokuDB within autobake-deb.shVicențiu Ciorbaru2021-01-292-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skipping the package within debian/rules won't work because starting with Debian 10, the helper scripts read the control file before the recipe.
| | | | * travis: 10.2 only - make fasterDaniel Black2020-10-061-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove from debian build: * tokudb * mroonga * spider * ograph * embedded server Add ccache to debian build. Backport 10.3 changes to autobake-deb that make travis faster. Merge instructions: Drop this commit on merge to 10.3
* | | | | Merge 10.5 into 10.6Marko Mäkelä2021-01-143-21/+25
|\ \ \ \ \ | |/ / / /
| * | | | deb: relax server version dependencies for non-storage-engine pluginsSergei Golubchik2021-01-121-2/+2
| | | | |
| * | | | deb: remove i386 from Build-Depends of ColumnStoreSergei Golubchik2021-01-121-9/+9
| | | | |
| * | | | deb: use ${server:Version} for the version of the server packageSergei Golubchik2021-01-123-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | and not ${binary:Version}, which is the version of the current package, whatever it is.
* | | | | Merge 10.5 into 10.6Marko Mäkelä2021-01-0713-70/+223
|\ \ \ \ \ | |/ / / /
| * | | | Deb: Ignore Lintian error on ColumnStore libjemalloc.so inclusionOtto Kekäläinen2021-01-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related: MDEV-24124 Partial upstreaming of Debian packaging commit https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/93a02bbe848ef9810d44635a3b4d409e71bd0628
| * | | | Salsa-CI: Use aptitude to resolve build dependenciesOtto Kekäläinen2021-01-031-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adopt the same install-build-deps.sh the upstream Salsa-CI has started using. Since we have our own custom build step (to support autobake-deb.sh) we need to maintain in like this and adopt to upstream changes. This change will make the stretch-backports build pass and use the backported libzstd-dev 1.3.8 library (to satisfy the > 1.3.3 requirement). Also clean away excess autopkgtest stanza and allow missing-breaks to fail so that in total Salsa-CI would now pass.
| * | | | Deb: Revert emptying /etc/mysql/debian.cnf on upgradesOtto Kekäläinen2021-01-031-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep the user and password definitions as e.g. dbconfig-common expects to find them there. Extend the file to document (in context) why it is about to be obsoleted to facilitate users migrating away from it. Upstreamed from https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/a6583c15226ad9a0ca37861e1bd01057bcff32a5
| * | | | Deb: Sync misc changes from downstream DebianOtto Kekäläinen2021-01-035-26/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add cracklib-runtime and libarchive-dev as build dependencies - Update Debian policy standards version to 4.5.0 - Add libssl-dev to libmariadb-dev run-time dependency - Add "Multi-Arch: same" to packages that have it in Debian - Sync README.Debian - Sync debian/rules formatting - Sync autopkgtests
| * | | | Deb: Fix upgrade from Percona.com by ensuring server uses mariadb.cnfOtto Kekäläinen2021-01-031-0/+12
| | | | | | | | | | | | | | | | | | | | Upstreamed from https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/13e3a7903e5c72e70c02b98a3e51a6de70b9b6ef
| * | | | Deb: Make dependencies and debian/rules cross-compile compatibleOtto Kekäläinen2021-01-032-22/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also clean away impossible/unnecessary "Multi-Arch: same" stanzas. Mostly upstreamed from https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/f0ba31e1565feaca9c2a6f2534e55bfc29af7021 Omitted 'libzstd-dev (>= 1.3.3)' as the version requirement would need stretch-backports to be available on buildbot.askmonty.org builders and they are not yet.
| * | | | Deb: Correct documentation about systemd using debian-startOtto Kekäläinen2021-01-032-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mariadb.service systemd file indeed does contain: ExecStartPost=/etc/mysql/debian-start So don't claim it does not use debian-start. Upstreamed from https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/af869e703014b25795b0891e3450520c599d3650
| * | | | Deb: Unify config file syntax styleOtto Kekäläinen2021-01-033-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - no space after comment - align equal signs in groups Upstreamed from: https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/a8c67e15c9a58199f085ae84cdb97c542667767d
* | | | | Merge 10.5 into 10.6Marko Mäkelä2021-01-047-480/+511
|\ \ \ \ \ | |/ / / /
| * | | | Deb: Remove PLUGIN_COLUMNSTORE=YES, it will build by default anywayOtto Kekäläinen2020-12-231-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If PLUGIN_COLUMNSTORE is not defined, ColumnStore will build automatically by default on supported architectures as defined in its CMakeFile.txt. Thus there should not be any need to inject this build flag at any point and it can be removed to keep thing lean and clean.
| * | | | Fix commit 113f18686d0 and d1809097966: PLUGIN_COLUMNSTORE=NO by defaultOtto Kekäläinen2020-12-232-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ColumnStore seems to build by default, so it must be explicitly disabled with a build flag, so that it does not build at all and thus build machine disk space and CPU will be spared. This reverts commit 113f18686d004788f13e3a5bb60ea1c77847c963.
| * | | | Fix previous commit: PLUGIN_COLUMNSTORE=YES can only be active on amd64Otto Kekäläinen2020-12-212-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor previous commit to fix mistake revealed by Buildbot. We can't have a structure where PLUGIN_COLUMNSTORE would ever be 'YES' on an arch that does not support it, as the flag overrides any potential platform detection code and builds on non-amd64 would all fail.
| * | | | Salsa-CI: Copy most of Salsa-CI from Debian 10.5Otto Kekäläinen2020-12-212-443/+474
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use new Salsa-CI templates just like downstream does - Also apply adaptations needed for native MariaDB to build correctly on Salsa-CI - Adapt for mysql-8.0 now in Debian Sid, keep also mysql-5.7 test - Test TLSv1.3 to ensure it does not regress - Remove Snappy compression from autopkgtest as it not longer works
| * | | | Deb: Don't build ColumnStore in native builds, only in autobake-deb.shOtto Kekäläinen2020-12-212-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ColumnStore files and debian/control stanza was removed in 1edd2243, and thus will not be included in a native build. Also adapt the debian/rules to follow this same policy and only build ColumnStore in builds triggered from autobake-deb.sh. Avoiding building ColumnStore in vain saves a lot of build time and disk space.
| * | | | Deb: Run 'wrap-and-sort -av' to debian/ contents is easier to compareOtto Kekäläinen2020-12-213-30/+30
| | | | | | | | | | | | | | | | | | | | | | | | | Maintaining the same deterministic file order in both upstream (this) and downstream (Debian) repositories makes it easier to compare the delta.
* | | | | Merge 10.5 into 10.6Marko Mäkelä2020-11-231-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Update MCS to resolve libmarias3 compulation for centos74-amd64-debugRoman Nozdrin2020-11-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pipeline in community BB Fix for rebuild from source step Disable MCS on i386|i686 platforms This patch puts MCS debian packaging files and part of debian/control into the engine directory
| * | | | This patch puts MCS debian packaging files and part of debian/controlRoman Nozdrin2020-11-147-220/+7
| | | | | | | | | | | | | | | | | | | | into the engine directory
* | | | | This patch puts MCS debian packaging files and part of debian/controlRoman Nozdrin2020-11-147-220/+7
| | | | | | | | | | | | | | | | | | | | into the engine directory
* | | | | Merge 10.5 into 10.6Marko Mäkelä2020-11-027-2/+19
|\ \ \ \ \ | |/ / / /
| * | | | deb: logrotate - fix my_print_defaults argDaniel Black2020-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | Corrects: 7803601dcb8e40746a10a4012b0c8eb08274db3e
| * | | | Add type_mysql_json.so to debian packagesVicențiu Ciorbaru2020-10-291-0/+1
| | | | |
| * | | | MCS engine ref updateRoman Nozdrin2020-10-201-0/+1
| | | | |
| * | | | MDEV-19275 Provide SQL service to plugins.Alexey Botchkov2020-10-201-2/+0
| | | | | | | | | | | | | | | | | | | | Duplicating lines removed from the debian script.
| * | | | MDEV-19275 Provide SQL service to plugins.Alexey Botchkov2020-10-192-0/+4
| | | | | | | | | | | | | | | | | | | | Debian scripts fixed.
| * | | | MDEV-22678: Debian Upgrade from MySQL-5.7 CE fails with "Plugin ↵Daniel Black2020-09-301-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'auth_socket' is not loaded MySQL.com and Percona packages can be root auth_socket only. MariaDB uses unix_socket. As the root user, as the default Debian maintaince user, needs to be accessible to run mariadb-upgrade for a start, we make it accessible again.
| * | | | Merge branch '10.4' into 10.5Sujatha2020-09-291-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '10.3' into 10.4Sujatha2020-09-282-2/+2
| | |\ \ \ | | | |/ /
| | | * | Merge branch '10.2' into 10.3Sujatha2020-09-282-2/+2
| | | |\ \ | | | | |/
| | | | * Merge branch '10.1' into 10.2Sujatha2020-09-282-2/+2
| | | | |\
| | | | | * MDEV-23697: /usr/bin/perl for debian scriptsDaniel Black2020-09-241-1/+1
| | | | | |
| | | | | * MDEV-23697: perl -w -> perlDaniel Black2020-09-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Leave debian/additions/mysqlreport as #!/usr/bin/perl Acknowledge that `env perl` is a hack, a complete fix needs to consider which path perl is at and insert into these scripts. The usefulness of these scripts is questionable.
* | | | | | Merge 10.5 into 10.6Marko Mäkelä2020-08-125-138/+49
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge mariadb-10.5.5Marko Mäkelä2020-08-101-121/+40
| |\ \ \ \ \
| | * | | | | MCOL-4229 ColumnStore fails to build on Ubuntu 20.10 due to missing readlineSergei Golubchik2020-08-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | partially revert 2c5831b2c5 - ColumnStore still needs readline to build
| | * | | | | MDEV-23342 MariaDB cannot be installed over MySQL 5.7.30 on Bionic anymoreSergei Golubchik2020-08-071-121/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Deb: fix Conflicts/Replaces/Breaks
| * | | | | | debian: 99-enable-encryption.cnf.preset file, not symlinkDaniel Black2020-08-082-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents errors on Windows Linux subsystem. Fix to pr #1600
| * | | | | | debian: remove gcc check. don't package rocksdb on x86_32Daniel Black2020-08-081-6/+4
| | | | | | |
| * | | | | | debian: disable rocksdb on 32bit with valid cmake directiveDaniel Black2020-08-081-1/+1
| |/ / / / /