Commit graph

203 commits

Author SHA1 Message Date
Tuukka Pasanen
ee30491e50 MDEV-32111: Debian Sid/Trixie will not have libncurses 5 anymore
Upstream Debian Sid which will become Debian Trixie (13)
have dropped NCurses version 5 and changed dev package name just
libncurses-dev
2024-01-14 13:27:10 +11:00
Sergei Golubchik
98a39b0c91 Merge branch '10.4' into 10.5 2023-12-02 01:02:50 +01:00
Faustin Lammler
81aba2c21f Fix typo 2023-11-28 16:30:04 +11:00
Faustin Lammler
60c01206df The MariaDB mailing list system has been moved
See: https://mariadb.org/mailing-lists/
2023-11-28 16:30:04 +11:00
Oleksandr Byelkin
f52954ef42 Merge commit '10.4' into 10.5 2023-07-20 11:54:52 +02:00
Anel Husakovic
77a229cd2d MDEV-31358: Update description for MariaDB debian/rpm packages
Reviewer: <daniel@mariadb.org>
2023-07-03 17:45:58 +10:00
Oleksandr Byelkin
1d74927c58 Merge branch '10.4' into 10.5 2023-04-24 12:43:47 +02:00
Oleksandr Byelkin
3d27f6d7f4 Merge branch '10.3' into 10.4 2023-04-21 09:10:58 +02:00
Salman Mohammadi
2a78c3ef6f MDEV-30509: mariadb-plugin-connect: introduce curl as recommends
in order to be able to retrieve files using REST queries. Otherwise,
`ERROR 1105 (HY000): Curl not installed.` will be thrown.
2023-01-31 16:20:55 +11:00
Marko Mäkelä
01d757036f Merge 10.3 into 10.4 2022-06-27 10:14:37 +03:00
Tuukka Pasanen
ace2e0301e MDEV-28666: Add correct 'Breaks' to make sure upgrade from 10.2 succeeds
File '/usr/bin/mariadb_config' has been moved from Debian package
libmariadbd-dev to libmariadb-dev since MariaDB version 10.2
this leads to situation where upgrade will no succeed but fail
with this kind of error message

 * trying to overwrite '/usr/bin/mariadb_config', which is also in package libmariadbd-dev 1:10.2.44+maria~bionic

Add libmariadbd-dev to libmariadb-dev Debian control files
'Breaks' solve situation and upgrading won't error anymore
2022-06-10 10:00:57 +10:00
Daniel Black
b73d852779 Merge 10.4 to 10.5 2022-03-17 17:03:24 +11:00
Daniel Black
069139a549 Merge 10.3 to 10.4
extra2_read_len resolved by keeping the implementation
in sql/table.cc by exposed it for use by ha_partition.cc

Remove identical implementation in unireg.h
(ref: bfed2c7d57)
2022-03-16 16:39:10 +11:00
Daniel Black
a950086036 Merge 10.2 (part) into 10.3
commit '6de482a6fefac0c21daf33ed465644151cdf879f'

10.3 no longer errors in truncate_notembedded.test
but per comments, a non-crash is all that we are after.
2022-03-15 16:44:52 +11:00
Daniel Black
6de482a6fe MDEV-28011: debian autobake cleanup
Travis is dead to us so we don't need all the conditions around it.

Remove depends for no longer supported versions

Debian Jessies, and Ubuntu Trusty, Xenial, Wily are all eol
as far as we are concerned.

The dependancy on an apt cache when running autobake broke the
10.2 aarch64 packages (MDEV-28014). Lets reduce the risk here.
2022-03-10 13:29:16 +11:00
Otto Kekäläinen
cda072bb4b Deb: Sync build and runtime dependencies from downstream to upstream
- Go back to using $MAJOR_VER instead of hard-coded version strings where
  possible.

- Default to 'auto' in NUMJOBS instead of just 1. Will make mysql-test-run
  faster.

- Unify autopkgtest with latest version in Debian, use eatmydata to make
  mysql-test-run faster.

- Salsa-CI: Remove obsolete 'artifacts: true' as that is the default value.

- Salsa-CI: Clean away obsolete temporary fixes.

- Salsa-CI: Unify with salsa-ci.yml in Debian, including test upgrades
  from Bullseye to Debian unstable.
2021-10-09 17:44:11 -07:00
Oleksandr Byelkin
7841a7eb09 Merge branch '10.3' into 10.4 2021-07-31 22:59:58 +02:00
Sergei Golubchik
6190a02f35 Merge branch '10.2' into 10.3 2021-07-21 20:11:07 +02:00
Anel Husakovic
85063aebda Update description of mariadb-common package
- Commit https://github.com/mariadb/server/commit/438ed0408c69
introduced `mariadb-common` package and added description. Example in
description is confusing since files referred to are not installed and
not related/owned by the `mariadb-common` package.
- Patch is updating real file/directory description section pointing to
the real examples owned by the package.
- Example:
```
mariadb-client-10.3				install
mariadb-client-core-10.3			install
mariadb-common					install
mariadb-server					install
mariadb-server-10.3				install
mariadb-server-core-10.3			install

/.
/etc
/etc/mysql
/etc/mysql/mariadb.cnf
/etc/mysql/mariadb.conf.d
/usr
/usr/share
/usr/share/doc
/usr/share/doc/mariadb-common
/usr/share/doc/mariadb-common/changelog.Debian.gz
/usr/share/doc/mariadb-common/copyright

```

Closes PR #1690
Reviewed by: otto@kekalainen.net
2021-07-09 10:04:30 +02:00
Vicențiu Ciorbaru
ca1dc0789b Follow-up for Deb: Stop depending on empty transitional package dh-systemd
058d93d47a introduced a switch in autobake
script to append dh-systemd package when it is necessary. However, the
change was not complete as it didn't actually remove the dh-systemd
dependency in debian/control.
2021-05-05 23:16:43 +03:00
Marko Mäkelä
6c3e860cbf Merge 10.4 into 10.5 2021-04-14 11:35:39 +03:00
Marko Mäkelä
5008171b05 Merge 10.3 into 10.4 2021-04-14 10:33:59 +03:00
Marko Mäkelä
6e6318b29b Merge 10.2 into 10.3 2021-04-13 10:26:01 +03:00
Otto Kekäläinen
058d93d47a Deb: Stop depending on empty transitional package dh-systemd
MariaDB Server still supports Ubuntu 16.04 "Xenial" until it goes EOL
in April 30, 2021. Thus we need to include a customization for backwards
compatibility.

This change is intended to be applied for all MariaDB versions still
supported, i.e. 10.2 to 10.6.
2021-04-12 17:19:54 +10:00
Otto Kekäläinen
5a4daa9099 Deb: Add Breaks/Replaces
Fix the following Breaks/Replaces errors detected by Salsa-CI:

  [ERROR] mariadb-server-10.5 conflicts with mysql-client-core-8.0 files:
    {'/usr/bin/myisam_ftdump', '/usr/share/man/man1/myisam_ftdump.1.gz'}
  [ERROR] mariadb-server-10.5 conflicts with mysql-server-core-8.0 files:
    {'/usr/share/man/man1/mysqlbinlog.1.gz',
     '/usr/share/man/man1/myisamlog.1.gz',
     '/usr/share/man/man1/mysql_tzinfo_to_sql.1.gz',
     '/usr/share/man/man1/perror.1.gz',
     '/usr/share/man/man1/myisampack.1.gz',
     '/usr/bin/mysqld_safe', '/usr/share/man/man1/myisamchk.1.gz',
     '/usr/bin/myisamchk', '/usr/bin/mysql_secure_installation',
     '/usr/bin/mysqld_multi', '/usr/bin/mysql_tzinfo_to_sql',
     '/usr/bin/perror', '/usr/share/man/man1/mysqld_multi.1.gz',
     '/usr/bin/myisampack', '/usr/share/man/man1/mysqld_safe.1.gz',
     '/usr/bin/myisamlog',
     '/usr/share/man/man1/mysql_secure_installation.1.gz',
     '/usr/bin/mysqlbinlog'}
  [ERROR] mariadb-test conflicts with mysql-server-core-8.0 files:
    {'/usr/lib/mysql/plugin/adt_null.so',
     '/usr/lib/mysql/plugin/mypluglib.so'}

Upstreamed from Debian packaging commits:
9b6a67b53c
f6d5545a02

Also:
- remove excess '<< ${source:Version}' on mysql-client-* and mysql-server-*
- move more packages to Conflicts as it is semantically more correct than
  having those packages in Replaces
2021-03-29 07:29:04 -07:00
Otto Kekäläinen
ab3777a3bf Revert "MDEV-23342 MariaDB cannot be installed over MySQL 5.7.30 on Bionic anymore"
This reverts commit 44885273f2.

Reverting this commit is necessary to fix missing-breaks errors in the
Debian packaging. The original fix was also not entirely necessary as a
fix to the original problem.

Partially also reverts commit e7c7f5c1bb where this
unsorted debian/control file was sorted.
2021-03-29 07:29:03 -07:00
Otto Kekäläinen
bba6c38630 Deb: Sync downstream changes upstream
- Reduce Build-Depends
  150bf990c6

  Dependencies chrpath, dh-apparmor and libarchive-dev are not needed.
  Fixes buildbot sid failures that error on:
    Unmet build dependencies: chrpath dh-apparmor libarchive-dev

- Salsa-CI: Remove mysql-5.7 upgrade in Sid test as package was removed
  6f55ac620c

  Also clean away extra Salsa-CI markup not needed anymore.

- Autopkgtest: Simplify autopkgtest 'smoke' to be easier to debug
  836907989a

- Autopkgtest: Skip main.failed_auth_unixsocket on armhf and i386
  74601f8b31
2021-03-10 08:50:12 +02:00
Otto Kekäläinen
7fb528d722 Deb: Remove build depencency libreadline-gplv2-dev no longer available
The Readline library is no longer available in Debian Sid.
See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=980504

Add the dependency on-the-fly in autobake-deb.sh for older distro versions
and keep the native build in a state that works on Debian Sid as-is.
2021-02-11 17:59:09 +02:00
Sergei Golubchik
2c845e0bd6 deb: relax server version dependencies for non-storage-engine plugins 2021-01-12 16:48:33 +01:00
Sergei Golubchik
0d2623d030 deb: remove i386 from Build-Depends of ColumnStore 2021-01-12 16:48:31 +01:00
Sergei Golubchik
5c53576c7b deb: use ${server:Version} for the version of the server package
and not ${binary:Version}, which is the version of the current
package, whatever it is.
2021-01-12 16:47:23 +01:00
Otto Kekäläinen
af8fa245a1 Deb: Sync misc changes from downstream Debian
- 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
2021-01-03 21:14:32 +02:00
Otto Kekäläinen
ea56841997 Deb: Make dependencies and debian/rules cross-compile compatible
Also clean away impossible/unnecessary "Multi-Arch: same" stanzas.
Mostly upstreamed from f0ba31e156

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.
2021-01-03 21:14:32 +02:00
Otto Kekäläinen
e7c7f5c1bb Deb: Run 'wrap-and-sort -av' to debian/ contents is easier to compare
Maintaining the same deterministic file order in both upstream (this) and
downstream (Debian) repositories makes it easier to compare the delta.
2020-12-21 19:03:29 +02:00
Roman Nozdrin
1edd224372 This patch puts MCS debian packaging files and part of debian/control
into the engine directory
2020-11-14 19:09:34 +00:00
Sergei Golubchik
2b856ecd98 MCOL-4229 ColumnStore fails to build on Ubuntu 20.10 due to missing readline
partially revert 2c5831b2c5 - ColumnStore still needs readline to build
2020-08-07 13:36:11 +02:00
Sergei Golubchik
44885273f2 MDEV-23342 MariaDB cannot be installed over MySQL 5.7.30 on Bionic anymore
Deb: fix Conflicts/Replaces/Breaks
2020-08-07 13:36:11 +02:00
Otto Kekäläinen
f99de8915e Deb: Make RocksDB plugin depend on python3 as myrocks_hotbackup needs it
This fixes the Lintian error and thus the Lintian override can also be
removed.
2020-07-30 10:36:39 +10:00
Otto Kekäläinen
497e7eda8c Deb: Stop suggesting tinyca, upstream project does not exist anymore
TinyCA has not been updated since 2016 and was removed from Debian in 2019
and the dev site https://tinyca.alioth.debian.org/ is offline.

See https://tracker.debian.org/pkg/tinyca
2020-07-30 10:36:39 +10:00
Otto Kekäläinen
7a0fa9da03 Deb: Cleanup and document
- Remove unnecessary unused files
- Remove duplicate encryption configuration sample from sources and
  re-use the identical file in RPM directory instead
- Clean away harmful "default-character-set = utf8mb4" from client config
  as it is unnecassary (server enforces utf8mb4 anyway by default) and
  could cause issues with mysqlbinlog and other tools (MDEV-22981).
- Update S3 plugin description to be long enough
- Remove trailing whitespace from support-files and Debian packaging.
- Clean away fixed Lintian issues
- Clean away temporary Salsa-CI fixes now that 10.5.4 is out and is fixed
- Apply wrap-and-sort -a -v
2020-07-30 10:36:39 +10:00
Roman Nozdrin
2c5831b2c5 MCOL-4166 The solution to the minor upgrade issue
DEB package doesn't need expect and libreadline as dependencies

RPM packages now depends on jemalloc again
2020-07-28 09:48:17 +00:00
Otto Kekäläinen
439377927b Deb: Misc ColumnStore Debian packaging improvements
- Add 'libboost-all-dev' and 'libreadline-gplv2-dev' as they were was found
  to be a compulsory build dependency for columnstore plugin.
- Add 'expect' as run-time dependencey for columnstore plugin as scripts
  use it:
    usr/bin/mcs_module_installer.sh: #!/usr/bin/expect
    usr/bin/remote_command.sh: #!/usr/bin/expect
    usr/bin/remote_command_verify.sh: #!/usr/bin/expect
    usr/bin/remote_scp_get.sh: #!/usr/bin/expect
    usr/bin/remote_scp_put.sh: #!/usr/bin/expect
    usr/bin/rsync.sh: #!/usr/bin/expect
- Properly define depends on Python. No Python 2 support needs to be
  considered, Python 3 has been around long enough. Fixes Lintian errors
    E: mariadb-plugin-columnstore: python-script-but-no-python-dep
    usr/bin/mcs-loadbrm.py #!python
    E: mariadb-plugin-columnstore: python-script-but-no-python-dep
    usr/bin/mcs-start-storagemanager.py #!python
- Partially revert undocumented and thus unjustified changes in commits
  d69a79da63287089efdc5f90a11ecd66ce55b471 and
  c0565666cfe6528b76bc53ce50d3690d13c92cf6.
- Trigger ldconfig, otherwise Lintian complains:
    E: mariadb-plugin-columnstore: package-must-activate-ldconfig-trigger
    usr/lib/x86_64-linux-gnu/libwriteengineredistribute.so
- Update postinst to be compatible with new server binary mariadbd name.
- Properly detect systemd or fallback to sysv init in postrm script.
- Only attempt to build ColumnStore on amd64 and i386. Test builds on
  Launchpad.net showed the CMake plugin configure step will prevent even
  attempts to build on other platforms.
- Clean up and unify cmake build command in debian/rules.
- Explicitly list files not installed.
- Run 'wrap-and-sort -a -v'.
- Truncate build logs on Salsa-CI to keep under 4 MB. This is now needed
  as the ColumnStore build is so verbose.
  See https://jira.mariadb.org/browse/MCOL-4111.
- Update Travis-CI dependencies to match new debian/control.
2020-07-10 21:56:14 +03:00
Patrick LeBlanc
04df0bdae7 A few important fixes for columnstore.
- fix columnstore's python dependencies (MCOL-4114)
 - reduce compiler warning count from 14k to ~100 (MCOL-4030)
 - disable bintar builds
2020-07-01 08:48:05 +02:00
Sergei Golubchik
8ad9ef642a MDEV-22972 After upgrading server/client to 10.5 clients identified via non-builtin plugins cannot be authenticated
in 10.5.4 libmariadb3 plugins were moved to a new location
2020-06-21 23:49:45 +02:00
Roman Nozdrin
aa9a42d639 Change the method to run SQL statements installing MCS to fix major update scenario.
Added binutils dependency.
2020-06-19 21:04:18 +02:00
Roman Nozdrin
1e7a68f84a Both RPM and DEB now restart MDB uninstalling the plugin.
Both RPM and DEB now conflicts on previous versions of MCS.

    Trim .deb packaging.

    MCS now depends on python. Python version varies in distributions.
2020-06-19 21:04:18 +02:00
Sergei Golubchik
71bf5085e4 MCS on i386 deb 2020-06-19 21:04:17 +02:00
Sergei Golubchik
c2b12c554e build deb packages for columnstore 2020-06-19 21:04:17 +02:00
Roman Nozdrin
09e8c77cad Clean up for debian packaging and updates for systemd service units. 2020-06-19 21:04:17 +02:00
Andrew Hutchings
793dcc7368 Add stub for building ColumnStore 2020-06-19 21:04:17 +02:00