Commit graph

671 commits

Author SHA1 Message Date
Nirbhay Choubey
ef7e173404 Removing rsync from the debian build dependency list. 2014-05-27 09:06:04 -04:00
Sergei Golubchik
eef1201bcc set version to 10.1.0 2014-05-25 17:17:50 +02:00
Nirbhay Choubey
86e73576dd Setting the "Standards-Version" in Debian control file
back to 3.8.3.
2014-05-25 00:23:17 -04:00
Nirbhay Choubey
bd5ca5e609 MDEV#6211: MariaDB-Galera-server uses 'socat', but 'socat' is
not in the dependency list

Added socat, grep, gawk, iproute, coreutils, findutils to the
dependency list.
2014-05-25 00:18:26 -04:00
Nirbhay Choubey
0f10b12b1c MDEV#6211: MariaDB-Galera-server uses 'socat', but 'socat' is
not in the dependency list

Added socat, grep, gawk, iproute, coreutils, findutils to the
dependency list.
2014-05-25 00:07:25 -04:00
Nirbhay Choubey
ab4947463e Merging changes from maria-5.5-galera and
some test fixes.

bzr merge -r3479..3493 maria-5.5-galera
2014-05-22 18:31:04 -04:00
Nirbhay Choubey
086af8367e bzr merge -r4209 maria/10.0. 2014-05-21 11:09:55 -04:00
Nirbhay Choubey
50d1e45cd4 MDEV#5925: New mariadb-galera-test packages
Added logic for generation of 'galera' test
packages.
2014-05-12 12:45:02 -04: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
Nirbhay Choubey
68a0f28def MDEV-6204: wsrep_sst_rsync timeout when lsof is not installed
* Added a check for lsof
* Added rsync & lsof to debian dependency list.
* Merged r3982 from codership-mysql/wsrep-5.5.
2014-05-03 09:18:11 -04:00
Nirbhay Choubey
bdeb847e9b MDEV-6192 [Warning] Failed to load slave replication state from
table mysql.gtid_slave_pos: 1286: Unknown storage engine 'InnoDB'

Removed 'loose-innodb' option from mysqld booststrap command
in debian post-installation script.
2014-04-30 15:40:00 -04:00
Nirbhay Choubey
29466e2c85 * Adding wsrep_sst_xtrabackup-v2 to deb server
files
* Updated .bzrignore
2014-04-25 18:23:14 -04:00
Jan Lindström
150e88e8c9 Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154. 2014-04-16 12:13:43 +03:00
Nirbhay Choubey
eec6222a89 Adding wsrep_sst_xtrabackup-v2 to the list of files
in mariadb-galera-server package.
2014-04-15 22:31:08 -04: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
Nirbhay Choubey
4213263101 Merging mariadb-10.0.10.
* bzr merge -rtag:mariadb-10.0.10 maria/10.0.
2014-04-08 10:36:34 -04:00
Sergei Golubchik
e82a82eef8 MDEV-6022 Patch 44_scripts__mysql_config__libs.dpatch is inapplicable, deb package creation fails 2014-04-07 20:52:04 +02:00
Nirbhay Choubey
90e4f7f9d3 * bzr merge -rtag:mariadb-10.0.9 maria/10.0
* Fix for post-merge build failures.
2014-03-26 14:27:24 -04:00
Nirbhay Choubey
586fab72f0 Merging deb/rpm script changes from maria-5.5-galera. 2014-03-24 16:40:24 -04:00
Nirbhay Choubey
4154f3aa05 Modified debian scripts to make galera packages
self-contained.
2014-03-14 17:54:53 -04:00
Nirbhay Choubey
8a99be643c Modified debian scripts to make galera packages
self-contained.
2014-03-14 17:52:55 -04:00
Nirbhay Choubey
ff0f41974c Debian script fixes. 2014-03-13 11:56:37 -04:00
Nirbhay Choubey
d395440d0f Debian script fixes. 2014-03-13 11:51:31 -04: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
Alexey Botchkov
7449c7d32b MDEV-5756 Add Audit Plugin to Debian packaging. 2014-02-28 00:41:08 +04:00
Sergei Golubchik
05aba79e98 MDEV-4447 MariaDB sources should have unix-style line endings everywhere 2014-02-27 12:00:16 +01:00
Nirbhay Choubey
6e3fc511c4 MDEV #5682 : Incompatible galera / mariadb-galera-server
version on Debian

Updated galera package version to >=25.2 in Debian/Ubuntu
control files.
2014-02-20 13:49:50 -05:00
Nirbhay Choubey
5de274c43b Fixed install_macros.cmake to set the correct
destination for documentation.
2014-02-19 13:59:10 -05:00
Nirbhay Choubey
e6a7a3804d * mysqld_safe could not start server as it failed
trying to perform wsrep position recovery.
  Fixed by correcting the erroneous mysqld command
  by properly quoting it.

* Merged the changes made to Ubuntu rules in previous
  revision to Debian rules.
2014-02-14 17:03:44 -05:00
Nirbhay Choubey
9564537cb1 Fixes in debian distribution files. 2014-02-13 09:33:04 -05: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
Nirbhay Choubey
4d254ef4f2 * Fixed debian dist file names.
* Fixed failing test results.
* Updated tztime.cc (lp:1161432).
2014-01-30 20:27:01 -05:00
Nirbhay Choubey
4a6be51f78 * Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera.
* Fixed Debian/Ubuntu dist files.
* Fixed some compiler warnings.
2014-01-30 12:45:38 -05:00
Nirbhay Choubey
ecc2c96c9d Merge of maria/5.5 into maria-5.5-galera.
bzr merge -r tag:mariadb-5.5.35 maria/5.5
2014-01-29 19:00:43 -05: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
Jan Lindström
d43afb8828 Merge MariaDB-10.0.7 revision 3961. 2014-01-25 11:02:49 +02:00
Sergei Golubchik
b85ab1d464 update debian patches to match the current code state 2014-01-23 00:02:22 +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
088c069462 fix debian builds 2013-12-11 21:09:18 +01:00