Commit graph

325 commits

Author SHA1 Message Date
Marko Mäkelä
829752973b Merge branch '10.0' into 10.1 2017-08-30 13:06:13 +03:00
Elena Stepanova
05e7d35e89 MDEV-13583 Improvements for MTR rebootstrap introduced in MDEV-12042
- make re-bootstrap run with all extra options, not only InnoDB ones
- re-use previously created bootstrap.sql
- add --console
- fix debian patch to keep it applicable
2017-08-28 19:49:02 +03:00
Sergei Golubchik
8e8d42ddf0 Merge branch '10.0' into 10.1 2017-08-08 10:18:43 +02:00
Sergei Golubchik
b7381526ab Always require OpenSSL 1.0 on Debian
auto-detecting whether it's called libssl-dev or libssl1.0-dev
2017-08-08 09:56:34 +02:00
Vicențiu Ciorbaru
786ad0a158 Merge remote-tracking branch 'origin/5.5' into 10.0 2017-07-25 00:41:54 +03:00
Daniel Black
f9dbfa58a5 MDEV-658: debian debug symbols require compat 9
Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
2017-07-18 15:41:22 +02:00
Nirbhay Choubey
3d8aacba86 SST script for mariabackup.
Execute mariabackup in innobackupex mode to avoid "unknown argument" error.
2017-04-27 19:12:41 +02:00
Vladislav Vaintroub
1991411f16 MDEV-9566 MariaBackup packaging 2017-04-27 19:12:40 +02:00
iangilfillan
f0ec34002a Correct FSF address 2017-03-10 18:21:29 +01:00
Jean Weisbuch
dbd1d7ea8e Updated innotop on debian/additions from 1.7.1 to 1.11.4 2017-03-07 15:27:21 +04:00
klemens
7be541f281 spelling fixes 2017-03-07 13:38:06 +04:00
Marko Mäkelä
adc91387e3 Merge 10.0 into 10.1 2017-03-03 13:27:12 +02:00
Daniel Black
156cf86def MDEV-11610: Alter Debian log rotate to not rotate binary/relay logs
Rotating binary/relay logs can cause interuption to the processing
on the server. Binary and relay logs have their own mechanism already
for not getting out of control (expire_logs_days).

By no longer rotating binary and relay logs log rotation is limited to
the following logs:
* error log
* general log
* slow query log

Writing these to the binary log would cause any logrotation on the
slave to occur twice, once due to this and another due to the log-
rotate script on the slave. Now --local is passed to mysqladmin to
prevent this duplication.
2017-03-02 15:16:06 +04:00
Kristian Nielsen
736afe8680 mysql_install_db enhancements to facilitate Debian bug#848616 fix
In Debian, the default install is made more secure by omitting the anonymous
user and by making the root account authenticate by unix socket
authentication instead of the default password-less root. However, Debian
hard-codes this change in mysql_install_db, which breaks that program for
other users.

This commit instead implements new general options for mysql_install_db that
can be used by anyone to similarly perform a more secure install:

  --skip-auth-anonymous-user: omits the anonymous user.

  --auth-root-authentication-method=normal: Keeps the existing behaviour
    with a password-less root account. Currently on by default.

  --auth-root-socket-user=USER
  --auth-root-authentication-method=socket: creates the MariaDB root user
    with the name USER (defaults to 'root') and using unix socket
    authentication. This way, only that user has MariaDB root access
    after install.

The idea with --auth-root-authentication-method=normal is that
applications that need this behaviour can give that option explicitly.
Then eventually we could make --auth-root-authentication-method=socket
the default, giving a more secure default installation.

Note that it is perfectly possible to do a secure install with
--auth-root-authentication-method=normal. For example, installing a
private server just for local access by a single OS-level user, by
using --skip-networking and putting the connection socket in a
location without public access. So it is important to preserve this
API for backwards compatibility.
2017-01-17 17:13:14 +01:00
Vicențiu Ciorbaru
8e15768731 Merge branch '10.0' into 10.1 2017-01-16 03:18:14 +02:00
Vicențiu Ciorbaru
ecdb39a9f5 Fix problems from 5.5 merge
* Update mysqld_safe script to remove duplicated parameter --crash-script
* Make --core-file-size accept underscores as well as dashes correctly.
* Add mysqld_safe_helper to Debian and Ubuntu files.
* Update innodb minor version to 35
2017-01-10 12:33:08 +02:00
Sergei Golubchik
8fcdd6b0ec Numerous issues in mysqld_safe 2016-12-22 12:25:10 +01:00
Sergei Golubchik
2f20d297f8 Merge branch '10.0' into 10.1 2016-12-11 09:53:42 +01:00
Sergey Vojtovich
cb7b03b00d MDEV-11164 - hardening-wrapper has been removed from Debian Sid
The hardening-wrapper package has been removed from Debian Sid. Remove
dependency and relevant settings.
2016-10-28 13:34:13 +04:00
Sergei Golubchik
414a417e91 MDEV-10032 Connect engine not installable on Xenial
s/unixODBC/unixodbc/
2016-06-28 12:54:01 +02:00
Nirbhay Choubey
7abb570756 MDEV-6211: MariaDB-Galera-server uses 'socat', but 'socat' is not in the dependency list
Xtrabackup-based SST method uses socat. Move it from
Suggests to Depends list.
2016-05-05 09:19:39 -04:00
Sergei Golubchik
87e3e67f43 Merge branch '10.0' into 10.1 2016-05-04 15:23:26 +02:00
Sergei Golubchik
872649c7ba Merge branch '5.5' into 10.0 2016-04-26 23:05:26 +02:00
Elena Stepanova
62122ba5d5 MDEV-9953 Debian packages install broken 'maria' test suite which cannot be run
Debian packages create empty maria/t and maria/r directories,
and MTR cannot run maria.* tests
2016-04-20 10:51:34 +03:00
Sergei Golubchik
fd6c588659 Merge branch 'bb-10.1-serg' into 10.1 2016-03-22 19:18:48 +01:00
Nirbhay Choubey
52ce743bbf MDEV-9382: After updating mariadb server apt-configure fails
When acting as a Galera receiver node, server startup may take
more than 30 secs (the current default) as it has to wait for
SST/IST operation to complete besides spending some time doing
wsrep recovery.

Fixed by raising the default value of MYSQLD_STARTUP_TIMEOUT
to 60 secs. Also sourced /etc/default/mariadb into the init
script so that it can be used to set MYSQLD_STARTUP_TIMEOUT.
2016-03-22 00:38:21 -04:00
Sergei Golubchik
3b0c7ac1f9 Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
Sergey Vojtovich
4aac51db9a MDEV-9587 - Debian packaging for GSSAPI plugin 2016-03-18 11:03:38 +04:00
Sergey Vojtovich
8942824a53 Fixed false errors returned by logrotate script
Logrotate script assumed an error if mysqladmin failed to connect to server
and there's mysqld process exists. However there can be non-system instance of
mysqld running (e.g. in docker) making this assumption wrong.

Check pid file existance instead.
2016-03-10 13:08:34 +04:00
iangilfillan
6befd84202 Update AskMonty and Atlassian references to MariaDB 2016-03-08 15:24:01 +02:00
Otto Kekäläinen
1777fd5f55 Fix spelling: occurred, execute, which etc 2016-03-04 02:09:37 +02:00
Otto Kekäläinen
802843eda0 MDEV-9643: Don't emit any "deb-systemd-helper not found" warnings 2016-02-29 23:02:53 +02:00
Jean Weisbuch
db5b51fb7e mysqlreport update to 4.0, see MDEV-573 for more informations 2016-02-17 21:46:32 +04:00
Daniel Dent
f22f2a62ae MDEV-9484 - Typo fixes 2016-02-17 21:46:32 +04:00
Sergei Golubchik
ed4fb9b248 MDEV-9259 Add missing mroonga files to Debian packaging in 10.1 2016-01-25 22:57:55 +01:00
Otto Kekäläinen
2a9f84b9a6 MDEV-9354: Debian: unmask the mysql.service on installation
Unmask the systemd mysql.service if left behind by mysql-server-5.6

Without this a simple 'apt-get install mariadb-server' would end
up with a system where mysqld is not running despite it was
running OK with mysql-server-5.6 installed, and users might wrongly
think mariadb-server package is broken when the real cause was
the removal of mysql-server-5.6 that left a /etc/systemd/system/
file behind pointing to /dev/null.
2016-01-11 10:28:00 +02:00
Sergey Vojtovich
87e6873ce9 MDEV-9081 - Debian: insecure debian-sys-maint password handling
Set umask so that newly created file is not readable by others. This is a quick
fix to close security gap. To be replaced by MDEV-8375 - passwordless root
login.
2015-12-22 19:13:51 +04:00
Sergei Golubchik
a2bcee626d Merge branch '10.0' into 10.1 2015-12-21 21:24:22 +01:00
Sergei Golubchik
1623995158 Merge branch '5.5' into 10.0 2015-12-13 00:10:40 +01:00
Otto Kekäläinen
5908d7ebb8 Force installation of MariaDB version of mysql-common
Make dependency on mysql-common package in debian/control
versioned to force that it is installed together with the other
mariadb-* packages. This ensures that the init.d and systemd
files for MariaDB mysqld are the ones from MariaDB.org repos.
2015-12-11 15:29:02 +01:00
Otto Kekäläinen
a60da73585 Make autobake-deb.sh to omit .git directory from source tar.gz
This is useful for developers who run autobake-deb.sh directly
from the source tree as the resulting source tar package will be
90% smaller and all operations regarding it consequently 10x faster.
2015-12-11 15:29:02 +01:00
Otto Kekäläinen
c5e7098d0f Add MySQL 5.6 stanzas next to MySQL 5.5 in debian/control file
This should make the provides/breaks/replaces/conflicts lines
work properly when upgrading from mysql-5.6 to mariadb-packages.

Conflicts:

	debian/control
2015-12-11 15:29:02 +01:00
Otto Kekäläinen
0d604dd828 Run wrap-and-sort for debian/* files. No functional changes. 2015-12-11 15:29:02 +01:00
Otto Kekäläinen
2e1c337350 Replace two identical debian/control files with a single one
The only difference between the files was the Debian standards
line by one micro version. There was no logical motivation why
there was separate control file for Debian and Ubuntu.

The new debian/control file lives directly at the correct location
and has the correct contents.

Modify autobake.sh to take into account new control file location.
2015-12-11 15:29:02 +01:00
Nirbhay Choubey
33f0cf7119 MDEV-9227 : Both CentOS service names mysql and mariadb exist?
As 10.1 has systemd support, there is no longer need to set
_SYSTEMCTL_SKIP_REDIRECT/SYSTEMD_NO_WRAP.
2015-12-09 12:24:53 -05:00
Christian Loos
ee2fce5e88 fix debian logrotate slow log filename
debian/additions/my.cnf sets slow_query_log_file to
/var/log/mysql/mariadb-slow.log.

Update the filename to rotate the slow log file.
2015-12-07 13:10:43 +04:00
Christian Loos
f3e5329846 switch from myisam_recover to myisam_recover_options
myisam_recover is only an alias for myisam_recover_options.
Use the option name instead of the alias is more correct.
This also avoids an note about the use of an alias instead of the option
name on every server start.
2015-12-03 17:06:05 +04:00
Sergei Golubchik
7f19330c59 Merge branch 'github/10.0-galera' into 10.1 2015-11-19 17:48:36 +01:00
Sergey Vojtovich
b80cc31ab4 MDEV-9082 - Debian: mysql_install_db is called on upgrade
A comment in debian/mariadb-server-10.1.postinst says: "can safely run on
upgrades with existing databases". While this is true there're a few reasons not
to do that:
- it increases installation time (it has to run rather heavy mysqld multiple times)
- as well as it increases mysqld downtime
- it may fail if database has some plugin specific configs (see MDEV-8437)
- there should be no need to run this script on upgrade: they should be handled
  by mysql_upgrade to
- RPM postin doesn't call it if database directory exists

Also postinst is not supposed to create database directories: let
mysql_install_db do that intead.
2015-11-06 12:11:06 +04:00
Sergey Vojtovich
7f5e005d16 MDEV-9080 - Debian: incorrect empty password check in postinst
There was code that was supposed to "catch upgrades from previous versions where
the root password wasn't set". But it is wrong in many regards:
- it is supposed to be executed against running server, but at this point server
  should be down, which makes this code no-op
- if the above is fixed, root password will be requested twice (initial root
  password request + this one)
- it asks for a password only once, while "initial root password request" asks
  twice (password + password verification)
- it may give false positive if unix socket based authentication is in effect

Removed this code since it didn't work for quite a while (at least since
mysql-5.1) and nobody cared about it.
2015-11-06 12:11:06 +04:00