Commit graph

485 commits

Author SHA1 Message Date
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
Sergei Golubchik
530a6e7481 Merge branch '10.0' into 10.1
referenced_by_foreign_key2(), needed for InnoDB to compile,
was taken from 10.0-galera
2015-09-03 12:58:41 +02:00
Otto Kekäläinen
c104e90eaa Unify virtual-* package definitions with official Debian packaging
Plus minor other fixes to debian/control file, wrap-and-sort,
versioned mariadb-common dependency etc. All changes based on
comparison with mariadb-10.0 packaging in official Debian
repositories.
2015-09-02 04:26:50 +03:00
Otto Kekäläinen
7b344bf940 Add MariaDB 10.0 stanzas next to MariaDB 5.5 in debian/control file
This should make the provides/breaks/replaces/conflicts lines
work properly when upgrading from mariadb-10.0 to mariadb-10.1
2015-09-01 23:56:19 +03:00
Otto Kekäläinen
cc08c134f7 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.
2015-09-01 23:01:43 +03:00
Otto Kekäläinen
6bd94cf542 Make galera-3 a Recommends instead of Depends in Debian packaging
Having galera-3 as a Depends stops installation of proceeding
on systems where package galera-3 is not available. The server
can run fine withouth galera enabled, therefore a more slack
relationship is more appropriate.
2015-08-30 22:59:27 +03:00
Nirbhay Choubey
91acc8b16f Merge tag 'mariadb-10.0.21' into 10.0-galera 2015-08-08 14:21:22 -04:00
Otto Kekäläinen
f425c71aba Merge documentation parts in debian/control from downstream 2015-07-22 14:58:43 +03:00
Otto Kekäläinen
5a3d752209 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-07-22 13:45:43 +03:00
Otto Kekäläinen
220b4f2fc2 Merge (most) build dependencies in debian/control with downstream
* dpatch cannot be removed yet, as packaging standard isn't updated
 * we don't want to remove libssl at all, as in upstream we rather
   use system provided OpenSSL than bundled, non-system updated and
   less commonly trusted YaSSL
 * keep versioned dependencies, they might prove helpful when building
   for multiple distros and releases
2015-07-22 13:15:36 +03:00
Otto Kekäläinen
16be184123 Extend debian/control build dependencies to max
For tracking purposes this step is committed first before
the unnecessary dependencies are trimmed away.

libpcre3-dev (>= 2:8.35-3.2~) is however omitted (compared to
downstream Debian packaging) as it is not available in precise
and we don't want to break builds on precise yet.
2015-07-22 11:59:40 +03:00
Otto Kekäläinen
61e31aa5d4 Remove files from debian/* that are unrelevant for this upstream repo
* README and NEWS are very old and mostly plain wrong and not needed
 * Lintian-overrides are relevant only in actual Debian QA systems
 * watch file was plain wrong and anyway relevant only in downstream distros
2015-07-22 11:29:21 +03:00
Otto Kekäläinen
6809fdb741 Update autobake.sh to match control file location. Drop lucid and squeeze support. 2015-07-22 10:28:39 +03:00
Otto Kekäläinen
af9509d0d8 debian/*: wrap and sort for cleaner diffs 2015-07-21 23:24:05 +03:00
Otto Kekäläinen
82e64fde07 Remove debian/dist/* and have just one version
Use the slightly better Ubuntu version in both Ubuntu and
Debian and latest versions of Debian don't have problems
with AppArmor files included in packaging.
2015-07-21 23:21:50 +03:00
Sergey Vojtovich
94bc50650e MDEV-8374 - Debian: mysqld_safe Can't log to error log and syslog at the same time
Let mysqld_safe_syslog.cnf force disable error log so that logging to syslog is
not affected by previous log_error setting.

Added handling of --skip-log-error to mysqld_safe.
2015-07-16 14:03:29 +04:00
Sergei Golubchik
658992699b Merge tag 'mariadb-10.0.20' into 10.1 2015-06-27 20:35:26 +02:00
Nirbhay Choubey
46024098be Merge tag 'mariadb-10.0.20' into 10.0-galera 2015-06-21 23:54:55 -04:00
Nirbhay Choubey
327409443f Merge tag 'mariadb-5.5.44' into 5.5-galera 2015-06-21 21:50:43 -04:00
Sergei Golubchik
5a4c5fa211 MDEV-5977 MariaDB 10.0 is not installable on Trusty when "trusty-updates universe" is in sources.list
fix upgrade[2] tests on trusty and utopic: add missing
conflicts/replaces, client-10.0 should conflict/replace client-5.5.

reformat other conflicts/replaces lines to make them easier
to read and merge
2015-06-17 14:18:16 +02:00
Sergei Golubchik
810cf362ea Merge branch '5.5' into 10.0 2015-06-11 20:20:35 +02:00
Sergei Golubchik
33d480f8b7 MDEV-4608 deb packages for jessie
jessie has newer automake so build-depends could not be satisfied.

refresh build-depends, remove automake, libtool,
doxygen, texlive-latex-base, ghostscript.
2015-06-03 16:33:10 +02:00
Sergei Golubchik
8e7d6652ad CRLF->LF 2015-06-02 22:07:47 +02:00
Nirbhay Choubey
a1f3356bf3 Update galera package name/version for debian 2015-04-15 10:21:46 -04:00
Sergei Golubchik
24341cb6cb add encryption plugins to deb packages 2015-04-10 18:01:53 +02:00
Elena Stepanova
bf963d3b52 MDEV-7874 deb package installation fails with "dpkg: dependency problems prevent configuration of mariadb-server"
Added usr/share/mysql/maria_add_gis_sp_bootstrap.sql to the file lists
2015-03-30 01:09:59 +03:00
Sergei Golubchik
2db62f686e Merge branch '10.0' into 10.1 2015-03-07 13:21:02 +01:00
Nirbhay Choubey
73a143ab34 Update galera package name 2015-03-04 19:52:15 -05:00
Nirbhay Choubey
e52a58a5cc Update galera package name 2015-03-04 19:49:17 -05:00