Commit graph

93 commits

Author SHA1 Message Date
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
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
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
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
dc94bd09b8 MDEV-7520 gtid replication broken during upgrade to debian 10.0.16
Don't binlog mariadb setup sql statements:
* use "mysql_install_db --disable-log-bin"
* use "mysqld --bootstrap --disable-log-bin"
* use "SET sql_log_bin=0"
2015-02-22 12:54:52 +01:00
Sergei Golubchik
6a1d44339b fix after 5.5 merge, debian packaging
* oqgraph is in a separate package in 10.0
* sphinx udf is in the ha_sphinx.so
2015-02-20 14:10:25 +01:00
Sergei Golubchik
d7e7862364 Merge branch '5.5' into 10.0 2015-02-18 15:16:27 +01:00
Sergei Golubchik
f007f82881 MDEV-7351 5.5 build fails on Ubuntu Utopic in buildbot
include oqgraph into deb packages conditionally, just like we do with tokudb
2015-02-09 20:53:28 +01:00
Elena Stepanova
0d73bc1c25 MDEV-7519 debian / ubuntu packaging creation of plugin table (if not exists)
Previously IF NOT EXISTS was added in Debian version in revno 3543. 
Now added the same for Ubuntu.
2015-02-08 15:47:00 +03:00
Sergei Golubchik
17956118ca debian packaging: add mroonga and example engines 2014-11-18 22:27:26 +01:00
Sergei Golubchik
1b75bed00f 5.5.40+ merge 2014-10-09 10:30:11 +02:00
Sergei Golubchik
9d4b365d5d MDEV-6550 Missing dependency on Debian 7 (Wheezy) installation package
add bsdutils dependency, because mariadb-server-5.5 deb package uses logger
2014-10-02 13:47:52 +02:00
Sergei Golubchik
989dd4d9ec 5.5 merge 2014-09-18 21:54:45 +02:00
Sergei Golubchik
e41bca0066 support statically linked jemalloc. use that for release builds 2014-09-18 17:00:44 +02:00
Sergei Golubchik
7e29c1b539 5.5 merge 2014-09-16 14:03:17 +02:00
Sergei Golubchik
f18b1400d1 debian: require jemalloc >= 3.0.0, because 2.2.5 (on precise) crashes 2014-09-15 18:55:17 +02:00
Sergei Golubchik
3d94523638 MDEV-6613 build system endianness test fails for ppc64le (i.e. Ubuntu)
* remove bundled jemalloc, use the system one
* force jemalloc in release builds on linux
2014-09-12 08:41:16 +02:00
Nirbhay Choubey
abbdc7ae86 MDEV-6118: Unable to install "MariaDB-connect-engine" when
using "MariaDB-Galera-server"

rpm: Updated components' requires-list to include "MariaDB"
     instead of "MariaDB-server".

deb: Added (ORed) 'mariadb-galera-server-10.0' to the 'Depends'
     list of connect and oqgraph engine packages.
2014-08-06 19:31:13 -04:00
Sergei Golubchik
e27c338634 5.5.38 merge 2014-06-06 00:07:27 +02:00
Sergei Golubchik
de8cb7a1f3 MDEV-5485 Minor man pages formatting issues
MDEV-6281 Typo in mysql_install_db scripts
and collateral changes:

* remove mysql_tableinfo.1 and references to it (there's no mysql_tableinfo)
* for debian: create manpages for mysqlrepair, mysqlanalyze, mysqloptimize
  (as symlinks for mysqlcheck.1, just as executables are symlinks to mysqlcheck)
* remove mysqlmanager.8 and references to it
* correct "very long line" error in mysqladmin.1
* simplify and fix table formatting in mysqlbinlog.1 and mysqldump.1
* fix a typo in the help text in mysql_install_db
* aria_chk: say "for Linux on x86_64", like other tools do
  (not "for Linux at x86_64")
* add simple manpages for aria_* utilities
2014-05-30 23:19:26 +02:00
Sergei Golubchik
d3e2e1243b 5.5 merge 2014-05-09 12:35:11 +02:00
Sergei Golubchik
a5beb350ae MDEV-5454 Dependencies for mariadb-connect-engine-10.0.deb don't look correct 2014-05-04 17:37:54 +02:00
Michael Widenius
e63c03db8d Merge with 10.0-base
Automatic merge, except for server_audit.cc that had to be modified slightly
Changes to xtradb and innobase where ignored was these made no sence for 10.0
2014-03-13 16:43:11 +02:00
Michael Widenius
1727849659 Merge with 5.5 2014-03-11 17:49:09 +02:00
Sergei Golubchik
5b7cab8219 default xtradb - fixes for debian packaging 2014-03-08 12:33:51 +01:00
Sergei Golubchik
2eaaeaeaa2 MDEV-5625 Debian package mariadb-client-5.5 lacks dependency on libterm-readkey-perl 2014-04-10 13:10:33 +02:00
Alexey Botchkov
7449c7d32b MDEV-5756 Add Audit Plugin to Debian packaging. 2014-02-28 00:41:08 +04:00
Sergei Golubchik
a0de0fd50e revert bugfix for MDEV-5295 deb upgrade 5.5 to 10.0.6 does not work
it didn't help, instead it only broke upgrades even more
2014-02-05 18:18:51 +01:00
Elena Stepanova
9e85bb709d MDEV-5591 Cannot build the package under Debian Wheezy
Rules performed unnecessary copying which made tests run with wrong
global testdir
2014-02-05 03:17:39 +04:00
Sergei Golubchik
72c20282db 10.0-base merge 2014-02-03 15:22:39 +01:00
Sergei Golubchik
65121806da upgrade sphinx to 2.1.5 2014-02-01 14:08:34 +01:00
Sergei Golubchik
59d9d08e2b 5.5 merge 2014-02-01 00:54:03 +01:00
Sergei Golubchik
a9c22c1888 MDEV-5295 deb upgrade 5.5 to 10.0.6 does not work
Use Breaks: not Conflicts:
2014-01-29 16:10:53 +01:00
Sergei Golubchik
74d29b0ed3 MDEV-5493 ha_sphinx.so is not included into Ubuntu deb packages (included into Debian) 2014-01-28 19:44:19 +01:00
Sergei Golubchik
4a3ea30221 MDEV-4787 Missing dependency to "patch" for the Debian/Ubuntu "mariadb-test" package
add patch as a "suggested" dependency to mariadb-test-5.5
2014-01-27 16:58:26 +01:00
Sergei Golubchik
5660d6a550 put ha_xtradb.so in deb packages 2013-12-22 17:09:10 +01:00
Sergey Vojtovich
4cee899fb7 MDEV-5319 - Request for merge of Oqgraph v3 functionality
storage/oqgraph into 10.0

- since oqgraph depends on Judy, move it to a separate package (DEB)
2013-12-16 16:03:34 +04:00
Sergey Vojtovich
258bf32d3c MDEV-4748 - metadata_lock_info plugin
- include metadata_lock_info plugin into debian packages
- ignore metadata_lock_info plugin in mysqld--help test
- let test suite run with built-in metadata_lock_info plugin
2013-12-13 12:42:45 +04:00
Sergei Golubchik
b2c56742b5 restore debian/dist/Ubuntu/control that was changed by mistake 2013-12-12 17:02:13 +01:00
Sergei Golubchik
cec76b3861 correct old assert in add_role_user_mapping_action to match changed function prototypes.
fix the element deleting logic for roles_mappings_hash
2013-12-09 12:39:31 +01:00
Sergei Golubchik
ed910b62e9 remove unused libevent (that was merged from 5.6 by mistake) 2013-11-21 15:05:25 +01:00
Sergei Golubchik
26f56089c7 add missing plugins to deb packages 2013-11-14 19:56:55 +01:00
Sergei Golubchik
4157185f24 10.0-base merge 2013-11-13 23:03:48 +01:00
Sergei Golubchik
bdd883ed9a 5.5. merge 2013-11-13 14:07:58 +01:00
Sergei Golubchik
3d57c343e5 MDEV-5038 put tokudb into the server package 2013-11-11 09:30:35 +01:00
Sergei Golubchik
ab2bf1ad0b merge with 10.0.5 2013-11-09 11:05:51 +01:00
Sergei Golubchik
af22c45ec7 mariadb-tokudb-engine-10.0.deb 2013-11-09 11:04:54 +01:00
Sergei Golubchik
80112232d1 misc fixes for buildbot 2013-11-07 14:30:21 +01:00