Commit graph

128 commits

Author SHA1 Message Date
Oleksandr Byelkin
b7362d5fbc Merge branch '10.3' into 10.4 2020-03-11 14:28:24 +01:00
Vicențiu Ciorbaru
fd2dc9c3fd Correctly link mysqlclient.pc to mariadb.pc under multi-arch support 2020-03-08 16:19:43 +02:00
Otto Kekäläinen
85d4a45d15 Deb: Run 'wrap-and-sort -a' so comparison across releases is easier
No functional changes.

Apply this in 10.3 so eventually it is merged to 10.4 and 10.5, which
in turn will have separate wrap-and-sort runs but only for new lines,
and not affecting badly next merges from 10.3 to 10.4 to 10.5.

Also remove a duplicate line that was found thanks to wrap-and-sort.
2020-02-13 20:47:23 +02:00
Otto Kekäläinen
1f0e72f874 Deb: Remove unnecessary manual libzstd1 dependency from RocksDB plugin
The Debian build tools add all run-time dependencies automatically. For the
mariadb-rocksdb-plugin the "${misc:Depends}, ${shlibs:Depends}" will become
(based on the build dependencies at build time):

  Depends: mariadb-server-10.4 (= 1:10.4.12-1), rocksdb-tools,
  libc6 (>= 2.29), liblz4-1 (>= 0.0~r130), libsnappy1v5 (>= 1.1.8),
  libstdc++6 (>= 7), libzstd1 (>= 1.3.3), zlib1g (>= 1:1.1.4)

There is no need to manually add run-time build dependencies. Only external
dependencies need to be defined, for example rocksdb-tools could come in
question for mariadb-plugin-rocksdb, and it will be eventually added when
downstream official Debian packaging is merged upstream in a later commit.
2020-02-13 20:47:23 +02:00
Sergei Golubchik
95898ac9bd Revert "Fix upgrade errors on eoan"
This reverts commit 0d345ec2e3.

Upgrades from 8.0 don't work yet, one has to dump/restore
manually to get the metadata out of the data dictionary.
2019-11-29 09:08:52 +01:00
Sergei Golubchik
0d345ec2e3 Fix upgrade errors on eoan
mariadb packages conflict with mysql-8.0
2019-11-28 16:01:02 +01:00
Otto Kekäläinen
97cd583df7 Deb: Sync non-functional changes from official Debian 10.4 packaging
- Update comment strings
- Extend package description to satisfy Lintian complaint
- Remove uscan stanza from rules as it is never used anyway
2019-09-18 16:11:49 +03:00
Otto Kekäläinen
ffd36093f1 Deb: Run 'wrap-and-sort -a' so comparison across releases is easier 2019-09-18 16:11:49 +03:00
Marko Mäkelä
e9c1701e11 Merge 10.3 into 10.4 2019-07-25 18:42:06 +03:00
Eugene Kosov
0f83c8878d Merge 10.2 into 10.3 2019-07-16 18:39:21 +03:00
Sergei Golubchik
d3c21484be MDEV-19942 Default installation of mariadb-server doesn't allow clients to use client plugins
while client tools technically don't need or depend on libmariadb3.so,
they need client plugins, that come with it.
2019-07-05 08:38:47 +02:00
Sergei Golubchik
48fb4504c5 MDEV-18337 Upgrade to 10.4 fails on some Ubuntu's due to dialog.so conflict
Restore changes from 10d347dc6a that were lost in a merge
2019-01-24 16:15:41 +01:00
Brave Galera Crew
36a2a185fe Galera4 2019-01-23 15:30:00 +04:00
Marko Mäkelä
734510a44d Merge 10.3 into 10.4 2019-01-06 17:43:02 +02:00
Sergei Golubchik
6bb11efa4a Merge branch '10.2' into 10.3 2019-01-03 13:09:41 +01:00
Sergei Golubchik
1f9f72b13e fix debian builds for cosmic 2019-01-03 00:23:05 +01:00
Marko Mäkelä
7830fb7f45 Merge 10.2 into 10.3 2018-08-28 12:22:56 +03:00
Marko Mäkelä
9258097fa3 Merge 10.1 into 10.2 2018-08-21 15:20:34 +03:00
Otto Kekäläinen
9dd3e5ea3c Deb: Make libmariadb3 Breaks+Replaces libmariadbclient18 so upgrade pass
The package libmariadbclient18 contains the dialog.so plugin, which also
the new libmariadb3 ships. As they both use the exact same path the latter
must be marked as a with Breaks and Replaces relations ship.

Note: This fix is conservative hack for stable releases 10.2 and 10.3.
In 10.4, the development release at the time, we will clean up how the
libmariadb3 packaging and it's -compat packages are done to match that
what is done in downstream Debian official.
2018-08-10 18:32:35 +03:00
faust
0496bbc120 MDEV-15869 Mariabackup is lacking some dependencies declaration (#771)
* Backport from 10.4 to resolve dependency problem

Using the dependency syntax from 10.4 branch because {$LIBSSL} can not
be used.
2018-08-09 21:05:40 +03:00
Otto Kekäläinen
10d347dc6a Deb: Make libmariadb3 Breaks+Replaces libmariadbclient18 so upgrade pass
The package libmariadbclient18 contains the dialog.so plugin, which also
the new libmariadb3 ships. As they both use the exact same path the latter
must be marked as a with Breaks and Replaces relations ship.

Note: This fix is conservative hack for stable releases 10.2 and 10.3.
In 10.4, the development release at the time, we will clean up how the
libmariadb3 packaging and it's -compat packages are done to match that
what is done in downstream Debian official.
2018-08-09 17:32:21 +03:00
Otto Kekäläinen
a12e6c5ba4 Deb: Don't define libzstd1 or other libraries as install dependencies manually
If something was built using a build dependency, it will automatically
be a install dependency via ${shlibs:Depends}, so no need to define it
manually.

This also fixes a bug related to a over autobake-deb.sh mangling
the control file architecture field on Trusty and Jessie.
2018-08-07 18:51:16 +03:00
Otto Kekäläinen
01e4426a63 Deb: Organize package order in control file to be more logical
This also better matches the package order in downstream, so it makes
it easier to compare upstream and downstream. Also wrap-and-sort.
2018-08-05 16:30:34 +03:00
Otto Kekäläinen
3173d73b71 Deb: Update the control file for 10.4 package names
- Update package names that had -10.3 to -10.4
- Update conflicts/breaks/replaces of to include now also 10.3,
  just like 10.3 had the same relationship to 10.2
- Remove some old  (<< ${source:Version}) not needed anymore as we
  are not moving files around inside the 10.4 releases (at least yet).
- Ensure all plugins depend on server or client binaries from the same
  release so that they for sure are binary API compatible.
2018-08-05 00:45:55 -05:00
Sergei Golubchik
36e59752e7 Merge branch '10.2' into 10.3 2018-06-30 16:39:20 +02:00
Sergei Golubchik
a19089ff4e MDEV-16537 aws key management plugin on Ubuntu bionic has impossible dependencies
remove manual libcurl3 dependency.
it'll be automatically added (libcurl3 or libcurl4, whatever was
actually used)
2018-06-24 15:18:36 +02:00
Sergei Golubchik
b942aa34c1 Merge branch '10.1' into 10.2 2018-06-21 23:47:39 +02:00
Sergei Golubchik
1033fa4bcc MDEV-13403 Mariadb (with TokuDB) excessive memory usage/leak
In RPM/DEB packages - always ld-preload jemalloc, instead
of linking ha_tokudb.so with it.

Keep linking in bintars, because they don't install cnf files
in the correct locations.
2018-06-21 10:15:27 +02:00
Sergei Golubchik
9f848da640 fix dependencies on bionic 2018-06-16 01:20:44 +02:00
Otto Kekäläinen
c98e6d4b3d Deb: Remove dependencies on packages that are 'essential' anyway
All packages in group 'essential' are by default installed on all
Debian and Ubuntu systems, and there is no need to mark them as
dependencies for any binary.
2018-05-28 11:32:22 +03:00
Otto Kekäläinen
44e7ec193e Deb: Extend new package descriptions to meet Lintian minimum criteria 2018-05-28 11:32:22 +03:00
Otto Kekäläinen
d46ebfb5b6 Deb: Mark binary package architectures correctly
(This change matches how debian/control is in downstream Debian.org)
2018-05-28 11:32:22 +03:00
Kristien Nielsen
c902d5a4de Apply debian/patches/61_replace_dash_with_bash_mbug675185.dpatch
We have carried along this patch as a patch inside our sources
since 2012 (commit cfd4fcb0bc).

The validity of this has thus been vetted in production for years
and the review done now did not find otherwise.

A race in dash causes mysqld_safe to occasionally loop infinitely.
Fix by using bash instead.

https://bugs.launchpad.net/ubuntu/+source/mysql-dfsg-5.0/+bug/675185

As this is the last patch, we can also clean away usage of dpatch.
2018-05-28 11:32:21 +03:00
Vicențiu Ciorbaru
96cee524fe MDEV-15578: MyRocks: support zstandard compression where the distro allows it
Add libzstd-dev as a build dependency to the server and libzstd1 as a
runtime dependency for rocksdb. libzstd is practially a mandatory
compression library to ensure adequate performance for RocksDB.
2018-05-24 19:55:52 +03:00
Otto Kekäläinen
c0f5addecb Deb: Remove versioning of MariaDB Backup and depend on client
There is no need for MariaDB Backup to be versioned. Other packages are
very unlikely to need to depend on a certain generation of this package.

Also for MariaDB Backup to run, it does not need the server, but client,
and from client only core parts.
2018-04-07 15:36:18 +03:00
Otto Kekäläinen
30f692f016 Deb: Make AWS key management plugin a special plugin not in Linux distros
It will only build if there is network access, which is a strict no-go
for Linux distributions. Thus the AWS plugin needs to be a custom built
only special plugin that is not built as part of the normal sources.

This fixes the build error in e.g. Launchpad:

  Performing download step (git clone) for 'aws_sdk_cpp'
  cd "/<<PKGBUILDDIR>>/builddir/plugin/aws_key_management" && /usr/bin/cmake ..
  Cloning into 'aws-sdk-cpp'...
  fatal: unable to access 'https://github.com/awslabs/aws-sdk-cpp.git/':
  Could not resolve host: github.com
2018-04-04 22:43:45 +03:00
Otto Kekäläinen
c720a1f8b8 Deb: Build RocksDB only on 64-bit and small endian architectures
RocksDB configure step checks that platform is 64-bit and little endian,
so limit the .deb packages to be built only on those platforms.

List of official Debian platforms at
https://www.debian.org/ports/index.en.html
2018-04-04 22:43:45 +03:00
Otto Kekäläinen
e88e967a3d Deb: Exclude libnuma-dev as build-dep on armhf where is does not exist 2018-04-04 22:43:45 +03:00
Sergei Golubchik
b1818dccf7 Merge branch '10.2' into 10.3 2018-03-28 17:31:57 +02:00
Vicențiu Ciorbaru
98eb9518db Merge remote-tracking branch 'origin/10.1' into 10.2 2018-03-16 14:12:00 +02:00
Vicențiu Ciorbaru
8152c52e1a Merge remote-tracking branch '10.0' into 10.1 2018-03-15 03:45:28 +02:00
Vicențiu Ciorbaru
3d5dff6cae Merge branch '5.5' into 10.0 2018-03-14 12:10:31 +02:00
Marko Mäkelä
b006d2ead4 Merge bb-10.2-ext into 10.3 2018-02-15 10:22:03 +02:00
Vicentiu Ciorbaru
adbf6caad6 debian/control Include myrocks_hotbackup into mariadb-plugin-rocksdb 2018-02-07 13:08:19 +00:00
Otto Kekäläinen
1d522353c8 Deb: wrap-and-sort -a the lib* packages in debian/control
This way all the libraries are listed in a logical order and it will later
be easier to compare the control file contents to downstream versions.
2018-01-16 13:48:00 +02:00
Otto Kekäläinen
3862d8bc89 Deb: wrap-and-sort -a 2018-01-16 13:48:00 +02:00
Otto Kekäläinen
a41192def8 Deb: Fix spelling etc Lintian complaints 2018-01-16 13:48:00 +02:00
Otto Kekäläinen
be59851ad9 Deb: Match official Debian package libmariadb-dev-compat
Using this package any source that expects MySQL Client libraries should
build without changes. Sources that expect MariaDB Connector C should
build using only libmariadb-dev.

Current MariaDB Connector/C does not build quite identically in
this source tree compared to how it build in Debian official.
The remaining differences are tracked in MDEV-14921.
2018-01-16 13:48:00 +02:00
Otto Kekäläinen
65db816c32 Deb: Split libmysqlclient19/20 compat links into a separate package
We already ship libmysqlclient18 that replaces any existing package
with the same name and install symlinks that point to out libmariadb.so.

Instead of creating more packages, we add just one more that does the
same and provides both libmysqlclient19 and -20 replacements symlinks.

This is a clean solution, because systems that only use (and are built
against) libmariadb will not need them and if somebody has done a mistake
in the linker parameters, they will spot it and can easily update the
filename to libmariadb.
2018-01-16 13:48:00 +02:00
Otto Kekäläinen
503fcfb80f Deb: Re-remove unnecessary version suffixes from package names
There is no point in having version suffixes in plugin packages. They
will via their control file anyway depend on the correct server or client
version. Having version suffices has no benefit and it just complicates
upgrades when a new major version name package needs to replace all
possible previous version.

This issue was overlooked when merging commit
844a575946 from 10.2 into 10.3, so it
needs to be manually fixed now.
2018-01-16 13:48:00 +02:00