Commit graph

1116 commits

Author SHA1 Message Date
Marko Mäkelä
d6d85c92ee Merge 10.11 into 11.0 2023-01-13 12:33:12 +02:00
Daniel Black
f879ee9ca0 deb: add lunar 2023-01-13 20:27:15 +11:00
Marko Mäkelä
ae79cedf4b Merge 10.11 into 11.0 2023-01-11 11:45:56 +02:00
Marko Mäkelä
3a237f7666 Merge 10.10 into 10.11 2023-01-11 11:13:56 +02:00
Marko Mäkelä
cae5a0328b Merge 10.9 into 10.10 2023-01-10 15:06:25 +02:00
Marko Mäkelä
820ebcec86 Merge 10.8 into 10.9 2023-01-10 14:50:58 +02:00
Marko Mäkelä
92c8d6f168 Merge 10.7 into 10.8
The MDEV-25004 test innodb_fts.versioning is omitted because ever since
commit 685d958e38 InnoDB would not allow
writes to a database where the redo log file ib_logfile0 is missing.
2023-01-10 14:42:50 +02:00
Otto Kekäläinen
70be59913c Deb: Misc fixes for 10.11 series
- Prefer Breaks+Replaces over Conflicts+Replaces in debian/control.

- Clean away conflict/break/replace with self as it either has no
  effect or harmfully prevents upgrades to self (packages from this
  source version).

- Remove references to mariadb-server-10.11 as the package names no
  longer have versions and thus such references are unnecessary cruft.

- Apply 'wrap-and-sort -av' and minor typo fixing.

- Extend Salsa-CI to test for upgrades from 10.9 and 10.10 to 10.11.

- Add minimal required new Lintian overrides so Salsa-CI would not
  fail on Lintian.
2023-01-06 19:20:00 +11:00
Rex
b075191ba8 MDEV-30353 Debian additions version fix
fix up version detection in debian/additions/innotop
        after 10->11
2023-01-06 19:07:37 +11:00
Marko Mäkelä
8356fb68c3 Merge 10.6 into 10.7 2023-01-04 14:52:25 +02:00
Marko Mäkelä
e441c32a0b Merge 10.5 into 10.6 2023-01-03 18:13:11 +02:00
Daniel Black
c4938eafc5 MDEV-30275: mariadb names rather than mysql names should be used
* mariadb-service-convert to use mariadbd-safe
* galera_recovery to use mariadbd
* mtr - wsrep use mariadb executables
* debian/mariadb-server.mariadb.init use mariadbd-safe
* debian/tests/smoke uses mariadb instead of mysql as client.

Co-Author: Daniel Black <daniel@mariadb.org>
2023-01-03 11:25:10 +11:00
Sergei Golubchik
71a72dd770 11.0 branch 2022-12-20 16:02:19 +01:00
musvaage
5bb2cc8dbc debian typos 2022-12-19 12:38:19 +11:00
musvaage
8b18932ebc debian typos 2022-12-19 09:46:26 +11:00
Marko Mäkelä
c194db34d9 Merge 10.10 into 10.11 2022-12-16 11:36:10 +02:00
Marko Mäkelä
3217ecd708 Merge 10.9 into 10.10 2022-12-16 11:24:07 +02:00
Marko Mäkelä
cf943127f6 Merge 10.8 into 10.9 2022-12-16 11:06:28 +02:00
Marko Mäkelä
8bddaddc6f Merge 10.7 into 10.8 2022-12-16 10:54:33 +02:00
Marko Mäkelä
299280738c Merge 10.6 into 10.7 2022-12-16 10:31:22 +02:00
Daniel Black
fa01ffb08e Merge branch '10.5' into 10.6 2022-12-15 18:27:11 +11:00
Daniel Black
802e26c347 Merge branch '10.10' into 10.11 2022-12-15 10:32:58 +11:00
Daniel Black
fc9d350ab7 Merge branch '10.9' into 10.10 2022-12-15 10:29:42 +11:00
Daniel Black
7df06dcbc3 Merge branch 10.5 into 10.6 2022-12-15 09:32:54 +11:00
Daniel Black
97c6cd9798 Deb: debian-start.inc - do not quote exe variables 2022-12-15 08:48:48 +11:00
Daniel Black
069eb169b3 Merge branch '10.8' into 10.9 2022-12-15 08:39:46 +11:00
Daniel Black
89480340ba Merge commit 10.7 into 10.8 2022-12-15 08:37:57 +11:00
Daniel Black
6524551bcf Merge branch 10.6 into 10.7 2022-12-15 08:33:20 +11:00
Daniel Black
930ee43507 Merge branch '10.5' into 10.6 2022-12-15 08:30:51 +11:00
Daniel Black
9ee055a27f Deb: mariadb-server.postinst to use mariadb-install-db 2022-12-14 20:52:06 +00:00
Daniel Black
952af4a179 Deb: MariaDB names as default for deb scripts
Also include the ftp.mariadb.org script rather than old name.
2022-12-14 20:52:06 +00:00
Marko Mäkelä
0aca3012a1 Merge 10.10 into 10.11 2022-12-14 09:18:30 +02:00
Marko Mäkelä
fa389b9098 Merge 10.9 into 10.10 2022-12-14 08:57:39 +02:00
Marko Mäkelä
b7914f562d Merge 10.8 into 10.9 2022-12-13 18:24:51 +02:00
Marko Mäkelä
d7a4ce3c80 Merge 10.7 into 10.8 2022-12-13 18:11:24 +02:00
Marko Mäkelä
25b91c3f13 Merge 10.6 into 10.7 2022-12-13 18:01:49 +02:00
Daniel Black
3b249a6e56 Merge branch '10.5' into 10.6
Adjust galera/galera_3nodes disabled tests.
2022-12-13 11:12:24 +11:00
Tuukka Pasanen
851816532b MDEV-28834: Add minimal support for Lintian version 2.115 and above
Convert minimal amount of Lintian overrides to make Lintian
test pass also with Debian Sid latest Lintian 2.115 version.

Old style overrides are kept so they can be used with
older versions of Lintian.

Introduce minimal Lintian overrides which are common
from MariaDB version 10.5 up-to to 10.8.

Overrides added files:
  * debian/mariadb-test-data.lintian-overrides
    - MariaDB installs some shared objects to test-suite directory and not in
      '/usr/lib' or similar. Share objects is pam_mariadb_mtr.so. Tags are
      arch-dependent-file-in-usr-share and
      arch-independent-package-contains-binary-or-object Lintia
 * debian/mariadb-test.lintian-overrides
   - MariaDB installs some some binaries to test-sute directory and
     in mariadb-test package they are my_safe_process and
     wsrep_check_version. Tags is
     arch-dependent-file-in-usr-share
 * debian/source/lintian-overrides
   - In source there is some source files missing which should be addressed
     sql/share/charsets/languages.html and
     and storage/rocksdb/rocksdb/docs/_includes/footer.html.
     Tags is source-is-missing
   - Add Lintian override for missing:
     storage/columnstore/columnstore/utils/jemalloc/libjemalloc.so.2
   - Add Lintian override for substvar external resources:
     ${source:Version} libmariadb-dev -> libmysqlclient-dev [debian/control:66]
     ${source:Version} libmariadb-dev -> libmysqld-dev [debian/control:66]
     ${source:Version} libmariadbd-dev -> libmariadbclient-dev [debian/control:216]
2022-12-08 17:01:39 +00:00
Marko Mäkelä
7933367a27 Merge 10.10 into 10.11 2022-11-21 10:51:10 +02:00
Marko Mäkelä
bebe193979 Merge 10.9 into 10.10 2022-11-21 10:32:08 +02:00
Marko Mäkelä
b35a048ece Merge 10.8 into 10.9 2022-11-21 10:25:38 +02:00
Marko Mäkelä
f46efb4476 Merge 10.7 into 10.8 2022-11-17 21:35:12 +02:00
Marko Mäkelä
d5332086d7 Merge 10.6 into 10.7 2022-11-17 09:19:32 +02:00
Otto Kekäläinen
f4adf35474
Misc Debian/Salsa-CI fixes (#2299)
* Deb: Handle codename 'n/a' from Debian Sid properly and autobake-deb cleanup

This fixes autobake-deb.sh builds on Sid which was visible as 4 failing
build steps on Salsa-CI.

- In Sid the LSBNAME might evaluate to 'n/a', so accept it as 'Sid' to
  fix builds that failed with error:

    Error - unknown release codename n/a

- Refactor list to have Ubuntu versions first, then Debian, and as last
  the special case of Debian Sid

- Fix minor syntax issues detected by Shellcheck

Also remove useless DEB_HOST_ARCH_CPU check from debian/rules:
* It was never in effect as the 'sed' in autobake-deb.sh cleared it anyway
* The variable name was wrong and always empty
* If variable would have been correct, logic was still reversed

- Define 3h timeout as the default 1h timeout on Gitlab.com (and others)
  is usually not enough for initial (uncached) MariaDB builds.

- Replace Buster to Bookworm/Sid upgrade testing with upgrade inside Buster
  testing as direct upgrades from Stretch to Bullseye and Buster to Bookworm
  are no longer possible due to:

    Bug#993755: libcrypt.so.1: cannot open shared object file when
    upgrading from Stretch to Sid (https://bugs.debian.org/993755)

- Stop ignoring MariaDB.org 10.6 to this version upgrade testing failures
  to reveal bug MDEV-28640. Originally this step was failing as the uring
  dependencies in upstream builders lagged behind and there was nothing
  that needed work, only time time to resolve. Now there is an actual bug
  in packaging that should be visible as a CI failure.

- Stop testing for 'service mysql status' on systems that upgraded from
  MySQL 8.0 to MariaDB.org vended 10.6. Due to some unidentified debian/control
  changes in 10.6 on upstream the upgrade is no longer compatible in
  a way that would maintain the init.d script with name 'mysql'.

- Fix typos where mergers had changed occurrences of 10.5 to 10.6 while
  they intentionally need to be exactly 10.5, otherwise the meaning
  changes.

- Align autopkgtest code with downstream official Debian packaging one.
  This is change is safe on a stable branch because is only affects builds
  and testing, not any actual usage of MariaDB 10.6.

- Standardize on using capitalized 'YES' in CMake build options
  (instead of 'yes' or mixed case)

- Add some comments to better document debian/rules

- Fix typo in Lintian overrides

Ubuntu bug: https://bugs.launchpad.net/ubuntu/+source/mariadb-10.6/+bug/1970634
MariaDB ticket: https://jira.mariadb.org/browse/MDEV-25633

When built with LTO on Ubuntu, MariaDB does not catch an exception when
the uring initialization fails due to a low RLIMIT_MEMLOCK value.

This commit amends the commit 0609b34555
to be identical to the one done downstream in Debian:
8d20ca979c

This way both the inline comments and 'git blame' for this section will
show properly why this is needed, and the fix is one that is fully tested
on Debian and Ubuntu.

Also having this section fully identical in upstream MariaDB and downstream
Debian will make the packaging maintenance easier as 'diff` runs on this
file will not flag this as a difference anymore.

In MDEV-28640 the init script failed to stop/start the MariaDB server
due to missing mysqladmin on the system. This was however very hard to
spot from the console output.

Add an explicit check for the binary the script depends on, and fail
verbosely if the dependency is missing.
2022-11-11 07:51:34 +00:00
Oleksandr Byelkin
ad937cf33a Merge branch '10.10' into 10.11 2022-11-02 13:08:01 +01:00
Oleksandr Byelkin
49a22c5897 Merge branch '10.9' into 10.10 2022-11-01 11:55:28 +01:00
Oleksandr Byelkin
ebf2121529 Merge branch '10.8' into 10.9 2022-11-01 10:33:44 +01:00
Marko Mäkelä
e0421b7cc8 Merge 10.7 into 10.8 2022-11-01 08:50:28 +02:00
Oleksandr Byelkin
1ebfa2af62 Merge branch '10.6' into 10.7 2022-10-29 19:22:04 +02:00
Daniel Black
d15260990d MDEV-22659: Create one logrotate config - Deb/Rpm fix 2022-10-27 21:18:17 +11:00