Commit graph

313 commits

Author SHA1 Message Date
Vladislav Vaintroub
b79944950e attempt to fix debian build (gssapi plugins require 10.1 client or server instead of 10.2 2016-05-14 15:37:14 +00:00
Sergei Golubchik
f67a2211ec Merge branch '10.1' into 10.2 2016-03-23 22:36:46 +01: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
Sergey Vojtovich
90c9641a8a MDEV-7331 - information_schema.user_variables 2016-02-26 18:35:14 +04:00
Sergei Golubchik
00d1db7a38 Merge branch '10.1' into 10.2 2016-02-25 18:19:55 +01: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
Monty
b2f8d7b410 Merge branch '10.1' into 10.2
Conflicts:
	VERSION
	cmake/plugin.cmake
	config.h.cmake
	configure.cmake
	plugin/server_audit/server_audit.c
	sql/sql_yacc.yy
2016-02-06 18:14:54 +02: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
Alexander Barkov
2ba7ed77aa Merge remote-tracking branch 'origin/10.1' into 10.2 2015-12-29 19:37:11 +04:00
Sergey
0f94f94b3b Merge pull request #123 from ottok/ok-debpkg-10.2
MDEV-9186 - Debian packaging: extend libcrack hack to create correct control file
2015-12-23 16:59:48 +04: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
Sergey Vojtovich
253be36c0f MDEV-7376 - Removal of the tool "mysql_zap" 2015-11-26 11:34:18 +04:00
Sergey Vojtovich
0b5e975cf8 MDEV-8654 - Remove mysqlbug
mysqlbug has been obsolete since MySQL 5.5, and has been removed in MySQL 5.7.
It's also of no use for reporting MariaDB bugs. The script and the associated
man page removed from MariaDB.
2015-11-26 11:34:18 +04:00
Otto Kekäläinen
e717ceb486 Debian packaging: extend libcrack hack to create correct control file
When the debian/control gets stripped off the libcrack3 dependency,
it should also strip off the mariadb-cracklib-password-check-10.2
package entry, otherwise the resulting Debian source package will
not be re-buildable independently later.
2015-11-24 11:57:10 +02:00
Sergei Golubchik
679aa122bf fix debian packaging for 10.2 2015-11-23 16:02:56 +01:00
Otto Kekäläinen
b7eaba474d Bump debian/changelog for 10.2 series 2015-11-23 16:11:06 +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
Sergey Vojtovich
60ad339840 MDEV-8437 - plugin variables conflict with bootstrap
There is no strong need to change password column: the only side effect is
that 4.0 -> 10.1 upgrades may get root/debian-sys-maint passwords stored in old
format. This should be perfectly acceptable, since all password at this point
are stored in old format.
2015-11-06 12:11:06 +04:00
Sergey Vojtovich
8e40f9b713 MDEV-8437 - plugin variables conflict with bootstrap
Removed redundant attempt to create mysql.plugin table:
- original code was supposed to INSTALL some plugins:
  INSERT INTO plugin VALUES ('innodb', 'ha_innodb.so'),
    ('federated', 'ha_federated.so'), ('blackhole', 'ha_blackhole.so'),
    ('archive', 'ha_archive.so');
- original code was supposed to fail if mysql.plugin exists:
  The query sequence is supposed to be aborted if the CREATE TABLE fails due
  to an already existent table in which case the admin might already have
  chosen to remove one or more plugins.
- mysql.plugin must've been created by preceeding mysql_install_db anyway
2015-11-06 12:11:05 +04:00
Nirbhay Choubey
3e043b30ac MDEV-8991: bind-address appears twice in default my.cnf
Add comment about bind-address mentioned under galera section.
2015-10-30 12:10:54 -04:00
Sergey Vojtovich
6346d1de2f MDEV-427/MDEV-5713 Add systemd script with notify functionality
After review/QA fixes.
2015-10-12 17:51:49 +02:00
Daniel Black
20c2ae39db MDEV-427/MDEV-5713 Add systemd script with notify functionality 2015-10-12 17:51:49 +02:00
Nirbhay Choubey
4d33f9dca0 Merge branch '5.5-galera' into 10.0-galera 2015-09-25 14:57:56 -04:00
Sergei Golubchik
9554342d16 Merge branch '10.1' into pull-request-97
Merge downstream Debian packaging (MDEV-6284)
2015-09-25 10:24:14 +02:00
Nirbhay Choubey
d39a2f7d11 Update mandatory wsrep configuration options 2015-09-19 09:08:58 -04:00
Nirbhay Choubey
fd1b2e486a MDEV-8803: Debian jessie 8.2 + MariaDB 10.1.7 + GaleraCluster
* Merge fix for issue #127 from mysql-wsrep (commit : a0ba0d7)
* Also, cherry-picked a similar fix for OpenSUSE (commit : 7790cb1)
2015-09-15 17:07:41 -04:00
Nirbhay Choubey
653aadcd59 MDEV-8804: bootstrap command missing in debian init script
Add 'bootstrap' to debian init script.
2015-09-15 16:27:04 -04:00
Otto Kekäläinen
d6c5e7e2cc Merge branch '10.1' of https://github.com/MariaDB/server into ok-debpkg-10.1 2015-09-05 21:28:14 +03:00
Otto Kekäläinen
b9fee60871 Revert "Make galera-3 a Recommends instead of Depends in Debian packaging"
This reverts commit 6bd94cf542.

Without galera as a compulsory dependency, test suite will not pass
due to failing:

wsrep.pool_of_threads wsrep.binlog_format wsrep.mdev_6832 wsrep.mdev_7798
2015-09-03 19:09:08 +03:00