summaryrefslogtreecommitdiff
path: root/debian
Commit message (Collapse)AuthorAgeFilesLines
* bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-211-7/+7
|\
| * 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
| | |
* | | MDEV-6192 [Warning] Failed to load slave replication state fromNirbhay Choubey2014-04-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | table mysql.gtid_slave_pos: 1286: Unknown storage engine 'InnoDB' Removed 'loose-innodb' option from mysqld booststrap command in debian post-installation script.
* | | Adding wsrep_sst_xtrabackup-v2 to the list of filesNirbhay Choubey2014-04-152-0/+2
| | | | | | | | | | | | | | | in mariadb-galera-server package.
* | | Merging mariadb-10.0.10.Nirbhay Choubey2014-04-082-0/+2
|\ \ \ | |/ / | | | | | | | | | * bzr merge -rtag:mariadb-10.0.10 maria/10.0.
| * | 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
| | | |
* | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-2611-41/+42
|\ \ \ \ | |/ / / | | | | | | | | | | | | * Fix for post-merge build failures.
| * | | 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)
* | | | Merging deb/rpm script changes from maria-5.5-galera.Nirbhay Choubey2014-03-242-4/+4
| | | |
* | | | Modified debian scripts to make galera packagesNirbhay Choubey2014-03-1436-647/+76
| | | | | | | | | | | | | | | | | | | | self-contained.
* | | | Debian script fixes.Nirbhay Choubey2014-03-136-25/+12
| | | |
* | | | Fixed install_macros.cmake to set the correctNirbhay Choubey2014-02-191-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | destination for documentation.
* | | | * mysqld_safe could not start server as it failedmariadb-galera-10.0.7Nirbhay Choubey2014-02-141-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Fixes in debian distribution files.Nirbhay Choubey2014-02-1331-80/+269
| | | |
* | | | * Fixed debian dist file names.Nirbhay Choubey2014-01-3011-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | * Fixed failing test results. * Updated tztime.cc (lp:1161432).
* | | | * Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera.Nirbhay Choubey2014-01-3015-44/+127
| | | | | | | | | | | | | | | | | | | | * Fixed Debian/Ubuntu dist files. * Fixed some compiler warnings.
* | | | Merge MariaDB-10.0.7 revision 3961.Jan Lindström2014-01-255-5/+23
|\ \ \ \ | |/ / /
| * | | 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
| | | |
* | | | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-049-44/+69
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | and a number of fixes to make this buildable. Run also few short multi-master high conflict rate tests, with no issues
| * | | 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