Commit graph

119 commits

Author SHA1 Message Date
Sergei Golubchik
e27c338634 5.5.38 merge 2014-06-06 00:07:27 +02:00
Sergei Golubchik
759fa19690 don't install ndb related .ini files, remove mysql_fix_privilege_tables.1 and mysqlman.1 2014-06-01 11:23:20 +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
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
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
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
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
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
Sergei Golubchik
f0e06e31ff 10.0 version of MDEV-5254 2013-11-07 13:39:46 +01:00
Sergei Golubchik
0fdb3bcfdb 10.0-base merge (roles) 2013-10-29 15:08:44 +01:00
Sergei Golubchik
779693f409 fixes for builbot 1 2013-10-20 16:39:51 -07:00
Sergei Golubchik
181b13d926 simplify CMakeLists.txt for cassandra/connect engines
now, if the dynamic plugin puts itself in a distinct component, then
* ${plugin}.cnf file is generated and installed automatically
* a separate RPM is generated automatically
* necessary FILELIST/PROVIDES/OBSOLETES/REQUIRES are filled in automatically
2013-09-25 19:32:14 +02:00
Sergei Golubchik
aaa3ec4aca fix debian packaging (again).
we don't build innodb plugin in 10.0 yet
2013-09-21 20:23:51 +02:00
Sergei Golubchik
2fe0836eed 5.5.33a merge 2013-09-20 11:29:01 +02:00
Sergei Golubchik
9af177042e 10.0-base merge.
Partitioning/InnoDB changes are *not* merged (they'll come from 5.6)
TokuDB does not compile (not updated to 10.0 SE API)
2013-09-21 10:14:42 +02:00
Sergei Golubchik
93b7d00f00 MDEV-5035 debian package conflict libmariadbclient18 5.5.33+maria-1~wheezy vs. mariadb-server-5.3 5.3.12-mariadb122~wheezy 2013-09-19 20:19:17 +02:00
Sergei Golubchik
4ec2e9d7ed 5.5 merge and fixes for compiler/test errors 2013-09-18 13:07:31 +02:00
Sergei Golubchik
197bdbae4d fix upgrades when mariadb-galera-server-5.5 is installed 2013-09-18 10:30:23 +02:00
Sergei Golubchik
69324831a4 mariadb-tokudb-engine deb package is not architecture-independent 2013-09-17 17:07:45 +02:00
Sergei Golubchik
6d06ccbe53 specify deb conflicts correctly 2013-09-16 21:21:15 +02:00
Sergei Golubchik
265bbf5fe1 introduce sysconf2dir, install tokudb.conf there, both in rpm and deb 2013-09-10 22:59:18 +02:00
Sergei Golubchik
3de5613445 INSTALL_DOCUMENTATION function for CMakeLists.txt
It puts files in the correct location for rpm/deb packages.
2013-09-10 22:53:44 +02:00
Sergei Golubchik
588a1d652f * mariadb-tokudb-engine-5.5.deb
* now only production-use server plugins are in mariadb-server.
  client plugins are now in libmariadbclient18,
  testing-only server plugins are now in mariadb-test
  (set Coflicts: field properly)
* fix Architecture: of mariadb-test
* terrible hack to support optional deb packages for optional plugins
2013-09-10 10:30:07 +02:00
Sergei Golubchik
6755944d08 remove PBXT 2013-08-30 11:25:49 +02:00