summaryrefslogtreecommitdiff
path: root/debian
Commit message (Collapse)AuthorAgeFilesLines
* 5.5.38 mergeSergei Golubchik2014-06-0628-769/+5
|\
| * don't install ndb related .ini files, remove mysql_fix_privilege_tables.1 ↵Sergei Golubchik2014-06-011-1/+0
| | | | | | | | and mysqlman.1
| * MDEV-5485 Minor man pages formatting issuesSergei Golubchik2014-05-3028-768/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | 5.5 mergeSergei Golubchik2014-05-093-9/+17
|\ \ | |/
| * MDEV-5625 Debian package mariadb-client-5.5 lacks dependency on ↵Sergei Golubchik2014-04-102-2/+10
| | | | | | | | libterm-readkey-perl
| * MDEV-6022 Patch 44_scripts__mysql_config__libs.dpatch is inapplicable, deb ↵Sergei Golubchik2014-04-071-7/+7
| | | | | | | | package creation fails
* | MDEV-5454 Dependencies for mariadb-connect-engine-10.0.deb don't look correctSergei Golubchik2014-05-042-2/+4
| |
* | Merge with 10.0-baseMichael Widenius2014-03-132-0/+2
|\ \ | | | | | | | | | | | | 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
| * \ Merge with 5.5Michael Widenius2014-03-112-0/+2
| |\ \ | | |/
| | * MDEV-5756 Add Audit Plugin to Debian packaging.Alexey Botchkov2014-02-282-0/+2
| | |
* | | default xtradb - fixes for debian packagingSergei Golubchik2014-03-082-2/+2
| | |
* | | MDEV-4447 MariaDB sources should have unix-style line endings everywhereSergei Golubchik2014-02-272-11/+11
| | |
* | | revert bugfix for MDEV-5295 deb upgrade 5.5 to 10.0.6 does not workSergei Golubchik2014-02-052-16/+16
| | | | | | | | | | | | it didn't help, instead it only broke upgrades even more
* | | MDEV-5591 Cannot build the package under Debian WheezyElena Stepanova2014-02-052-10/+0
| | | | | | | | | | | | | | | | | | Rules performed unnecessary copying which made tests run with wrong global testdir
* | | 10.0-base mergeSergei Golubchik2014-02-037-18/+29
|\ \ \ | |/ /
| * | 5.5 mergeSergei Golubchik2014-02-017-18/+28
| |\ \ | | |/
| | * MDEV-4787 Missing dependency to "patch" for the Debian/Ubuntu "mariadb-test" ↵Sergei Golubchik2014-01-272-0/+2
| | | | | | | | | | | | | | | | | | package add patch as a "suggested" dependency to mariadb-test-5.5
| | * update debian patches to match the current code stateSergei Golubchik2014-01-235-13/+13
| | |
* | | upgrade sphinx to 2.1.5Sergei Golubchik2014-02-012-2/+0
| | |
* | | MDEV-5295 deb upgrade 5.5 to 10.0.6 does not workSergei Golubchik2014-01-292-16/+16
| | | | | | | | | | | | Use Breaks: not Conflicts:
* | | MDEV-5493 ha_sphinx.so is not included into Ubuntu deb packages (included ↵Sergei Golubchik2014-01-281-0/+1
| | | | | | | | | | | | into Debian)
* | | put ha_xtradb.so in deb packagesSergei Golubchik2013-12-222-1/+2
| | |
* | | MDEV-5319 - Request for merge of Oqgraph v3 functionalitySergey Vojtovich2013-12-165-2/+17
| | | | | | | | | | | | | | | | | | storage/oqgraph into 10.0 - since oqgraph depends on Judy, move it to a separate package (DEB)
* | | MDEV-4748 - metadata_lock_info pluginSergey Vojtovich2013-12-132-0/+2
| | | | | | | | | | | | | | | | | | - 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
* | | restore debian/dist/Ubuntu/control that was changed by mistakeSergei Golubchik2013-12-121-11/+8
| | |
* | | correct old assert in add_role_user_mapping_action to match changed function ↵Sergei Golubchik2013-12-091-8/+11
| | | | | | | | | | | | | | | | | | prototypes. fix the element deleting logic for roles_mappings_hash
* | | remove unused libevent (that was merged from 5.6 by mistake)Sergei Golubchik2013-11-212-2/+2
| | |
* | | add missing plugins to deb packagesSergei Golubchik2013-11-143-8/+17
| | |
* | | 10.0-base mergeSergei Golubchik2013-11-136-28/+11
|\ \ \ | |/ /
| * | 5.5. mergeSergei Golubchik2013-11-136-28/+11
| |\ \ | | |/
| | * MDEV-5038 put tokudb into the server packageSergei Golubchik2013-11-116-28/+11
| | |
* | | merge with 10.0.5Sergei Golubchik2013-11-092-2/+4
|\ \ \
| * | | 10.0 version of MDEV-5254Sergei Golubchik2013-11-072-2/+4
| | | |
* | | | mariadb-tokudb-engine-10.0.debSergei Golubchik2013-11-095-8/+8
| | | |
* | | | misc fixes for buildbotSergei Golubchik2013-11-072-2/+2
|/ / /
* | | 10.0-base merge (roles)Sergei Golubchik2013-10-291-6/+6
|\ \ \ | |/ /
| * | fixes for builbot 1Sergei Golubchik2013-10-201-6/+6
| | |
* | | simplify CMakeLists.txt for cassandra/connect enginesSergei Golubchik2013-09-251-0/+1
| | | | | | | | | | | | | | | | | | | | | 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
* | | fix debian packaging (again).Sergei Golubchik2013-09-212-2/+0
| | | | | | | | | | | | we don't build innodb plugin in 10.0 yet
* | | 10.0-base merge.Sergei Golubchik2013-09-2111-37/+79
|\ \ \ | |/ / | | | | | | | | | Partitioning/InnoDB changes are *not* merged (they'll come from 5.6) TokuDB does not compile (not updated to 10.0 SE API)
| * | 5.5.33a mergeSergei Golubchik2013-09-202-2/+4
| |\ \ | | |/
| | * MDEV-5035 debian package conflict libmariadbclient18 5.5.33+maria-1~wheezy ↵Sergei Golubchik2013-09-192-2/+4
| | | | | | | | | | | | vs. mariadb-server-5.3 5.3.12-mariadb122~wheezy
| * | 5.5 merge and fixes for compiler/test errorsSergei Golubchik2013-09-1811-11/+83
| |\ \ | | |/
| | * fix upgrades when mariadb-galera-server-5.5 is installedSergei Golubchik2013-09-182-4/+4
| | |
| | * mariadb-tokudb-engine deb package is not architecture-independentSergei Golubchik2013-09-172-2/+2
| | |
| | * specify deb conflicts correctlySergei Golubchik2013-09-162-4/+4
| | |
| | * introduce sysconf2dir, install tokudb.conf there, both in rpm and debSergei Golubchik2013-09-101-0/+1
| | |
| | * INSTALL_DOCUMENTATION function for CMakeLists.txtSergei Golubchik2013-09-101-2/+2
| | | | | | | | | | | | It puts files in the correct location for rpm/deb packages.
| | * * mariadb-tokudb-engine-5.5.debSergei Golubchik2013-09-1010-8/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * remove PBXTSergei Golubchik2013-08-301-3/+0
| | |