Commit graph

652 commits

Author SHA1 Message Date
Michal Schorm
17b4f99928 Update FSF address
This commit is based on the work of Michal Schorm, rebased on the
earliest MariaDB version.

Th command line used to generate this diff was:

find ./ -type f \
  -exec sed -i -e 's/Foundation, Inc., 59 Temple Place, Suite 330, Boston, /Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, /g' {} \; \
  -exec sed -i -e 's/Foundation, Inc. 59 Temple Place.* Suite 330, Boston, /Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, /g' {} \; \
  -exec sed -i -e 's/MA.*.....-1307.*USA/MA 02110-1335 USA/g' {} \; \
  -exec sed -i -e 's/Foundation, Inc., 59 Temple/Foundation, Inc., 51 Franklin/g' {} \; \
  -exec sed -i -e 's/Place, Suite 330, Boston, MA.*02111-1307.*USA/Street, Fifth Floor, Boston, MA 02110-1335 USA/g' {} \; \
  -exec sed -i -e 's/MA.*.....-1307/MA 02110-1335/g' {} \;
2019-05-10 20:52:00 +03:00
Oleksandr Byelkin
8cbb14ef5d Merge branch '10.1' into 10.2 2019-05-04 17:04:55 +02:00
Sergei Golubchik
3db6de33b2 MDEV-17640 UMASK_DIR configuration for mysql_install_db is not applied to mysql database
create mysql and test databases with SQL, not mkdir.
2019-04-24 16:06:54 +02:00
Sergei Golubchik
2f9cd06da4 MDEV-18362 EPOCH=1 needs to be set for Ubuntu 18.10 cosmic builds
Apply dbart's patch to set epoch for all ubuntu releases starting
from bionic. Not only for bionic.

This works for Debian too (VERNUM=unstable, etc).
2019-04-24 16:06:54 +02:00
Marko Mäkelä
2a791c53ad Merge 10.3 into 10.4 2019-03-06 09:00:52 +02:00
Marko Mäkelä
a2fc36989e Merge 10.2 into 10.3 2019-03-04 17:01:00 +02:00
Sergei Golubchik
20043cf650 remove aws kms plugin from debian builds too 2019-03-01 12:40:43 -05:00
Sergei Golubchik
000c6cfc61 debian: more robust control file hacking
when deleting a package, delete up to the next empty line,
instead of relying on a package description being of
some fixed number of lines long
2019-03-01 12:40:43 -05:00
Sergei Golubchik
7f6d88944c MDEV-12484 Enable unix socket authentication by default
Debian part. Do not ask to set a root password,
do not create debian-sys-maint user (but preserve an existing one
on upgrades - user scripts might be relying on it).

Just create an empty /etc/mysql/debian.cnf for --defaults-file not to fail
2019-02-21 15:04:03 +01:00
Sergei Golubchik
83de75d66d try harder to link unix_socket plugin statically
fix unix_socket tests to work if unix_socket is a built-in
2019-02-21 15:04:03 +01:00
Oleksandr Byelkin
93ac7ae70f Merge branch '10.3' into 10.4 2019-02-21 14:40:52 +01:00
Oleksandr Byelkin
c8f9b3f915 remove aws-key management plugin 2019-02-20 08:44:08 +01:00
Sergei Golubchik
9b76e2843b Merge branch '10.3' into 10.4 2019-01-26 01:13:41 +01:00
Sergei Golubchik
3b1b665fcb Merge branch '10.2' into 10.3 2019-01-25 20:35:40 +01:00
Sergei Golubchik
d4515d1305 Deb: don't edit control file from inside rules file
It's too late. Might work or not (and on buster it doesn't).
2019-01-25 19:57:37 +01:00
Marko Mäkelä
78829a5780 Merge 10.3 into 10.4 2019-01-24 22:42:35 +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
Jan Lindström
55be043c13
Merge pull request #1120 from tempesta-tech/sysprg/MDEV-17835v2
MDEV-17835: Remove wsrep-sst-method=xtrabackup
2019-01-23 12:07:36 +02:00
Julius Goryavsky
0e89e90f42 MDEV-17835: Remove wsrep-sst-method=xtrabackup
The second line of changes related to replacing xtrabackup with
mariabackup:

1) All unnecessary references to xtrabackup are removed from
the documentation, from some comments, from the control files
that are used to prepare the packages.

2) Made corrections of the tests from the galera_3nodes suite
that mentioned xtrabackup or the old (associated with xtrabackup)
version of innobackupex.

3) Fixed flaws in the galera_3nodes mtr suite control scripts,
because of which they could not work with mariabackup.

4) Fixed numerous bugs in the SST scripts and in the mtr test
files (galera_3nodes mtr suite) that prevented the use of Galera
with IPv6 addresses.

5) Fixed flaws in tests for rsync and mysqldump (for galera_3nodes
mtr tests suite). These tests were not performed successfully without
these fixes.

https://jira.mariadb.org/browse/MDEV-17835
2019-01-22 13:28:03 +01: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
Sergei Golubchik
812bb1303c (still) Packaging is broken for debian-based systems
fix the AWS SDK build eligibility checks.

followup for 779151db80
2018-12-24 11:06:19 +01:00
Julius Goryavsky
1a4248ad6c MDEV-18064: Packaging is broken for debian-based systems
Packaging is broken for debian-based systems after removing
xtrabackup scripts. This is due to the fact that links to the
scripts are not removed from the installation file
(from the debian/mariadb-server-10.3.install).

Also in this fix some comments have been added to the
documentation, indicating that using xtrabackup[-v2] is
an deprecated, therefore user should use mariabackup instead.

https://jira.mariadb.org/browse/MDEV-18064
2018-12-23 01:10:59 +01:00
Teodor Mircea Ionita
779151db80 autobake-deb: fixes for AWS SDK build eligibility checks.
Add check for git command and test for internet connectivity
using bash /dev/tcp interface, instead of wget and curl which might
not be available, thus reducing dependencies for this script.
2018-12-21 13:44:14 +01:00
Marko Mäkelä
6dbc50a376 Merge 10.3 into 10.4 2018-12-13 22:05:34 +02:00
Marko Mäkelä
f6e16bdc62 Merge 10.2 into 10.3 2018-12-13 21:58:35 +02:00
Marko Mäkelä
2e5aea4bab Merge 10.1 into 10.2 2018-12-13 15:47:38 +02:00
Sergei Golubchik
541500295a debian install/upgrade fixes
1. don't run full mysql_upgrade on every server restart,
   use --version-check to do it only once

2. fix syslog tag name in the postinst script, don't pretend
   mysqld_safe generated all these messages. Auto-detect the version
   to simplify maintenance
2018-12-12 20:19:56 +01:00
Sergei Golubchik
4abb8216a0 MDEV-17658 change the structure of mysql.user table
Implement User_table_json.
Fix scripts to use mysql.global_priv.
Fix tests.
2018-12-12 00:31:44 +01:00
Marko Mäkelä
c761b43451 Merge 10.3 into 10.4 2018-11-08 10:19:55 +02:00
Marko Mäkelä
074c684099 Merge 10.3 into 10.4 2018-11-06 16:24:16 +02:00
Sergei Golubchik
4990b0e1ee MDEV-17496 aws plugin is no longer built for debian/ubuntu
ping is not a reliable way to detect github's availability
2018-11-06 13:36:50 +01:00
Marko Mäkelä
df563e0c03 Merge 10.2 into 10.3
main.derived_cond_pushdown: Move all 10.3 tests to the end,
trim trailing white space, and add an "End of 10.3 tests" marker.
Add --sorted_result to tests where the ordering is not deterministic.

main.win_percentile: Add --sorted_result to tests where the
ordering is no longer deterministic.
2018-11-06 09:40:39 +02:00
Marko Mäkelä
32062cc61c Merge 10.1 into 10.2 2018-11-06 08:41:48 +02:00
Sergei Golubchik
44f6f44593 Merge branch '10.0' into 10.1 2018-10-30 15:10:01 +01:00
Sergei Golubchik
37ab7e4596 Merge branch '5.5' into 10.0 2018-10-27 20:46:38 +02:00
Sergei Golubchik
7223369d89 Revert "Update rules"
This reverts commit ebaacf0747.

Pushed by mistake.
Broke tokudb on trusty-amd64.
2018-10-24 06:49:22 +02:00
Marko Mäkelä
1bf3e8ab43 Merge 10.3 into 10.4 2018-09-11 21:31:03 +03:00
Marko Mäkelä
c3a80175b1 After-merge fix: s/tokudb_logdump/tokudb_logprint/ 2018-09-07 07:27:05 +03: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
Marko Mäkelä
734db318ac Merge 10.3 into 10.4 2018-08-16 10:08:30 +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
Rasmus Johansson
ebaacf0747
Update rules 2018-08-06 16:46:19 +03:00
Otto Kekäläinen
cb1945dd0d MDEV-16666: Partially revert "Deb: Update documentation and fix spelling errors"
This partially reverts commit 548ec3a088
by removing the misfixed misspellings.
2018-08-05 17:15:03 +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
cb6e888384 Deb: Fix brittle line numbers with simple paragraph detection
After this there will be no need to maintain line numbers, as the
extent of the sed deletion will automatically be until next empty line.
2018-08-05 01:15:43 -05:00
Otto Kekäläinen
26c7b4f3fa Deb: Open new changelog entry for 10.4 2018-08-05 00:45:55 -05:00
Otto Kekäläinen
aa6c1a6d19 Deb: Mass replace 10.3 with 10.4 inside files 2018-08-05 00:45:55 -05: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
Otto Kekäläinen
788314ddf8 Deb: Rename all 10.3 files into 10.4 as this is a 10.4 branch now 2018-08-04 23:43:07 -05:00
Rasmus Johansson
41acca8bfa Added -j option to dpkg-buildpackage to speed up build 2018-08-02 11:28:59 +00:00
Rasmus Johansson
a89a6e4f77 Added -j option to dpkg-buildpackage to speed up build 2018-08-02 11:27:22 +00:00
Alexey Botchkov
efba0b1df5 MDEV-15473 Isolate/sandbox PAM modules, so that they can't crash the server.
New version of PAM plugin (v2.0) added along with the old v1.0.
There the pam module is isolated in the auth_pam_tool application so
cannot crash the server.
2018-07-03 15:49:34 +04:00
Marko Mäkelä
c3289d27ee Merge mariadb-10.3.8 into 10.3 2018-07-03 10:22:43 +03:00
Sergei Golubchik
eaab98f702 after-merge fix 2018-07-02 09:30:10 +02:00
Sergei Golubchik
f3ac221ffd Fix deb build failure on Xenial: disable -fPIE
Correct 898a8c3c0c to work when newer debhelper-10.2 is installed from
xenial-backports (or jessie-backports).

Use gcc version instead of debproxy version, this is likely a gcc
issue (as disabling LTO and gcc's linker plugin fixes it).
2018-07-01 16:10:59 +02:00
Sergei Golubchik
36e59752e7 Merge branch '10.2' into 10.3 2018-06-30 16:39:20 +02:00
Otto Kekäläinen
5ef4870bb3 Travis-CI: Ensure AWS key management plugin is not built nor packaged
Building this plugin which requires run-time access to network, uses a lot
of disk space and is slow was already partially disabled. This way we
also ensure that on cmake level it never runs even if it out of some
autodetection reason at times thought it could run.

This fixes the error message:
  fatal: unable to access 'https://github.com/awslabs/aws-sdk-cpp.git/':
  Problem with the SSL CA cert (path? access rights?)
2018-06-30 00:34:07 +03:00
Otto Kekäläinen
d6b26a8924 Travis-CI: Don't build nor package the embedded server to save disk space
Fixes errors on Travis like:
  cp: error writing debian/libmariadbd19//usr/lib/x86_64-linux-gnu/
  libmariadbd.so.19: No space left on device
2018-06-29 17:31:20 +03:00
Otto Kekäläinen
dbdaafb014 autobake-deb: Stop packaging plugins that are not built
This complements commit ecb0e0ade4 that
disabled a bunch of plugins from being built on Travis-CI (due to time
and disk space saving reasons).

When the plugins are not built, the packaging phase will fail due to
missing files. This change omits the files from packaging to the process
can complete successfully.
2018-06-29 17:28:43 +03:00
Teodor Mircea Ionita
ecb0e0ade4 autobake-deb: disable storage engines using -DPLUGIN 2018-06-29 13:57:36 +03:00
Teodor Mircea Ionita
1d5220ae23 MDEV-16213: Exclude more engines from autobake-deb.sh 2018-06-29 13:57:36 +03:00
Sergei Golubchik
f25a5c39c1 MDEV-14560 Extra engines enabled through additional config are not loaded on first installation
Solution for Debian/Ubuntu: install a trigger to restart mysqld
automatically whenever a package changes something in /etc/mysql
or in /etc/systemd/system/mariadb.service.d
2018-06-24 15:18:36 +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
ffb96be9e7 fix debian packaging for tokudb 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
1db1340c0c MDEV-14578: mysql_install_db install unix_socket plugin when --auth-root-authentication-method=socket
post-merge fixes
2018-06-21 10:15:27 +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
Sergei Golubchik
93ab0effd3 MDEV-16187 Ubuntu Bionic MariaDB has epoch version that makes 10.1 and 10.2 installs fail
backport cb21e117ba from 10.2
2018-06-15 10:14:18 +02:00
Otto Kekäläinen
738c5c8424 MDEV-12642: Build deb source packages on buildbot, just not on Travis-CI 2018-06-05 16:06:03 +03:00
Otto Kekäläinen
898a8c3c0c Deb: Disable PIE in debian/rules on older Debian/Ubuntu releases
This partially reverts commit dc0a76600b.
2018-06-02 21:32:18 +03:00
Otto Kekäläinen
00677b368b Deb: Import default.mk instead of only the subset buildflags.mk
Include all the Makefiles that define variables that can be useful
within debian/rules. This includes buildflags.mk as well.

Use the standard variable names and don't define our own.
2018-05-29 23:52:47 +03:00
James Clarke
26d50036d9 Deb: Fix FTBFS on non-Linux architectures that don't support systemd
For details see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=852728
2018-05-29 23:52:47 +03:00
Adrian Bunk
dc0a76600b Deb: Don't disable PIE in debian/rules, it's enabled anyway
For details see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=865737
2018-05-29 23:52:46 +03:00
Otto Kekäläinen
a2499a2d46 Deb: Clean away legacy rules sections which no longer have a function 2018-05-29 23:52:46 +03: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
Otto Kekäläinen
0a2ef601e0 Deb: Skip building RocksDB, TokuDB and using jemalloc on certain archs
(This change matches how debian/rules is in downstream Debian.org)
2018-05-28 11:32:21 +03:00
Otto Kekäläinen
548ec3a088 Deb: Update documentation and fix spelling errors 2018-05-28 11:32:21 +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
Christian Hammers
64094e12c0 Apply debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch
We have carried along this patch as a patch inside our sources
since 2012 (commit cfd4fcb0bc).

This same patch has been used also in MySQL packaging at Oracle
and in downstream Debian.org packages for both MySQL and MariaDB.

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

Code contributed to Oracle with
http://forge.mysql.com/wiki/Sun_Contributor_Agreement

Reported as http://bugs.mysql.com/bug.php?id=31361
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
Sergei Golubchik
2609783aac MDEV-15627 debian packages install /etc/mysql/mariadb.cnf however its not read by default 2018-05-22 13:11:14 +02:00
Sergei Golubchik
4ec8598c1d Merge branch 'github/10.2' into 10.3 2018-05-22 11:47:09 +02:00
Sergei Golubchik
cb21e117ba MDEV-16187 Ubuntu Bionic MariaDB has epoch version that makes 10.1 and 10.2 installs fail 2018-05-16 23:24:14 +02:00
Sergei Golubchik
c9717dc019 Merge branch '10.2' into 10.3 2018-05-11 13:15:10 +02:00
Sergei Golubchik
9b1824dcd2 Merge branch '10.1' into 10.2 2018-05-10 13:01:42 +02:00
Sergei Golubchik
ff579bc814 install disks plugin on debian 2018-05-09 15:39:38 +02:00
Sergey Vojtovich
9a84980668 MDEV-12645 - mysql_install_db: no install test db option
Added --skip-test-db option to mysql_install_db. If specified, no test
database created and relevant grants issued.

Removed --skip-auth-anonymous-user option of mysql_install_db. Now it is
covered by --skip-test-db.

Dropped some Debian patches that did the same.

Removed unused make_win_bin_dist.1, make_win_bin_dist and
mysql_install_db.pl.in.
2018-04-30 19:34:08 +04:00
Mohd Shakir Zakaria
4c136f80a5 Updated apparmor-profile for spelling errors 2018-04-16 15:44:59 +04:00
Otto Kekäläinen
7980364804 Deb: Fix commit c0f5addecb - also rename .install file 2018-04-09 23:09:03 +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