Commit graph

235 commits

Author SHA1 Message Date
Nirbhay Choubey
dad555a09c Merge tag 'mariadb-10.0.23' into 10.0-galera 2015-12-19 14:24:38 -05: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
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
Nirbhay Choubey
4d33f9dca0 Merge branch '5.5-galera' into 10.0-galera 2015-09-25 14:57:56 -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
Nirbhay Choubey
91acc8b16f Merge tag 'mariadb-10.0.21' into 10.0-galera 2015-08-08 14:21:22 -04: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
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
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
Nirbhay Choubey
af651c80f7 Merge tag 'mariadb-10.0.17' into 10.0-galera
Conflicts:
	storage/innobase/include/trx0trx.h
2015-02-27 17:36:54 -05: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
Nirbhay Choubey
860576f416 Merge branch '10.0' into 10.0-galera
Merge branch 10.0 till revision:
f37bdd9 - Merge remote-tracking branch 'github/10.0' into 10.0

Conflicts:
	.bzrignore
	storage/xtradb/CMakeLists.txt
2015-02-18 18:07:45 -05:00
Nirbhay Choubey
3c9137deeb Merge branch '5.5' into 5.5-galera
Merge banch 5.5 till revision :
fdd6c11 - MDEV-7419 Function cli_safe_read not exported

Conflicts:
	.bzrignore
	debian/dist/Debian/mariadb-galera-server-5.5.files.in
	debian/dist/Ubuntu/mariadb-galera-server-5.5.files.in
	storage/tokudb/CMakeLists.txt
	support-files/build-tags
2015-02-18 17:15:57 -05: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
Nirbhay Choubey
f6e1906ced MDEV-7470: MariaDB-Galera-server uses 'tar', but 'tar' is
not in the dependency list

Added tar to the dependency list.
2015-01-18 18:16:36 -05:00
Nirbhay Choubey
41367e4023 MDEV-7204: mariadb-galera-server el7 rpms packaging
issue, no mariadb-server in provides
MDEV-7233: Fix issue with missing dependency socat
           when installing MariaDB-galera-server on
           RedhatEL/OracleEL/(Others?) RPM based 

* Added mariadb-server to "provides" for MariaDB Galera
  server package. (rpm)
* Removed "socat" from MariaDB Galera server's mandatory
  dependency list. (rpm)
* Moved "socat" from mandatory to optional dependency. (deb)
2014-12-09 10:35:16 -05:00
Nirbhay Choubey
86d7512f42 MDEV-7204: mariadb-galera-server el7 rpms packaging
issue, no mariadb-server in provides
MDEV-7233: Fix issue with missing dependency socat
           when installing MariaDB-galera-server on
           RedhatEL/OracleEL/(Others?) RPM based 

* Added mariadb-server to "provides" for MariaDB Galera
  server package. (rpm)
* Removed "socat" from MariaDB Galera server's mandatory
  dependency list. (rpm)
* Moved "socat" from mandatory to optional dependency. (deb)
2014-12-09 10:27:49 -05:00
Nirbhay Choubey
3bb02f3e6d bzr merge -rtag:mariadb-10.0.15 maria/10.0 2014-12-05 12:33:02 -05:00
Sergei Golubchik
17956118ca debian packaging: add mroonga and example engines 2014-11-18 22:27:26 +01:00
Nirbhay Choubey
068fb8569f bzr merge -rtag:mariadb-5.5.40 maria/5.5 2014-10-09 17:25:08 -04:00
Sergei Golubchik
1b75bed00f 5.5.40+ merge 2014-10-09 10:30:11 +02:00
Sergei Golubchik
dbda20caff remove mariadb.pc file again, it cannot be added in a GA version 2014-10-08 09:35:00 +02:00
Sergei Golubchik
c1a4f0c5ab include mariadb.pc in debian builds 2014-10-08 00:45:56 +02:00
Sergei Golubchik
e73e1e7c7a packaging issues:
* skip debian 44_scripts__mysql_config__libs.dpatch it does not apply anymore
  (and anyway it would not work for a static library)
* fix the path for install(mariadb.pc)
2014-10-07 16:21:53 +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
Nirbhay Choubey
c916085e27 bzr merge -rtag:mariadb-10.0.14 maria/10.0/ 2014-09-28 20:43:56 -04:00
Nirbhay Choubey
023366e6eb Moved wsrep_slave_threads to optional settings. 2014-09-24 12:17:29 -04:00
Nirbhay Choubey
59277a7d83 Moved wsrep_slave_threads to optional settings. 2014-09-24 12:16:09 -04:00
Nirbhay Choubey
e207e5fe27 Updated config files:
- Removed QC restriction
 - Added bind-address
Fixed file permissions for wsrep_sst_rsync.sh.
Removed some unnecessary files.
2014-09-23 14:33:27 -04:00
Nirbhay Choubey
851e428e4e Updated config files:
- Removed QC restriction
 - Added bind-address
Fixed file permissions for wsrep_sst_rsync.sh.
2014-09-23 14:03:13 -04: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