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
Jan Lindström
ea6f92662c
MDEV-5430: Debian MariaDB-Galera packages do not get built in buildbot [Part 4]
...
Missed one file name change.
2013-12-11 10:45:49 +02:00
Jan Lindström
92a15782f9
MDEV-5428: Debian MariaDB-Galera packages do not get built in buildbot [Part 3]
...
Missed one lintian rule.
2013-12-11 09:38:21 +02:00
Jan Lindström
3ad45220bc
Additional name fixes.
2013-12-10 17:45:02 +02:00
Sergei Golubchik
b2c56742b5
restore debian/dist/Ubuntu/control that was changed by mistake
2013-12-12 17:02:13 +01:00
Jan Lindström
170c3c2b21
MDEV-5423: Debian MariaDB-Galera packages do not get built in buildbot [Part 2]
...
Fix: Server name is mariadb-galera-5.5
2013-12-10 10:34:41 +02: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
Jan Lindström
3df2aa9458
MDEV-5385: Debian MariaDB-Galera packages do not get built in buildbot
...
Analysis: File names were incorrect for distribution files.
Fix: Fixed file names to be same as in 5.5.
2013-12-05 19:22:00 +02:00
Jan Lindström
329fb58656
MDEV-5385: Debian MariaDB-Galera packages do not get built in buildbot
...
Added missing .in files and updated CMakeLists.txt to contain galera
specific files.
2013-12-04 18:49:40 +02:00
Seppo Jaakola
496e22cf3b
merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6
...
and a number of fixes to make this buildable.
Run also few short multi-master high conflict rate tests, with no issues
2013-12-04 10:32:43 +02:00
Jan Lindström
071edcfea0
Merge with MariaDB 5.5.34.
2013-11-25 17:14:08 +02: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
