summaryrefslogtreecommitdiff
path: root/debian
Commit message (Expand)AuthorAgeFilesLines
* Merging mariadb-10.0.10.Nirbhay Choubey2014-04-082-0/+2
|\
| * Merge with 10.0-baseMichael Widenius2014-03-132-0/+2
| |\
| | * 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
|\ \ \ \ | |/ / /
| * | | 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
| * | | MDEV-5591 Cannot build the package under Debian WheezyElena Stepanova2014-02-052-10/+0
| * | | 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
| | | * 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
| * | | MDEV-5493 ha_sphinx.so is not included into Ubuntu deb packages (included int...Sergei Golubchik2014-01-281-0/+1
* | | | 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
* | | | Debian script fixes.Nirbhay Choubey2014-03-136-25/+12
* | | | Fixed install_macros.cmake to set the correctNirbhay Choubey2014-02-191-1/+0
* | | | * mysqld_safe could not start server as it failedmariadb-galera-10.0.7Nirbhay Choubey2014-02-141-1/+4
* | | | Fixes in debian distribution files.Nirbhay Choubey2014-02-1331-80/+269
* | | | * Fixed debian dist file names.Nirbhay Choubey2014-01-3011-0/+0
* | | | * Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera.Nirbhay Choubey2014-01-3015-44/+127
* | | | 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
| * | | MDEV-4748 - metadata_lock_info pluginSergey Vojtovich2013-12-132-0/+2
| * | | 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
| * | | 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
|\ \ \ \ | |/ / /
| * | | 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
| * | | fix debian packaging (again).Sergei Golubchik2013-09-212-2/+0
| * | | 10.0-base merge.Sergei Golubchik2013-09-2111-37/+79
| |\ \ \ | | |/ /
| | * | 5.5.33a mergeSergei Golubchik2013-09-202-2/+4
| | |\ \ | | | |/
| | | * MDEV-5035 debian package conflict libmariadbclient18 5.5.33+maria-1~wheezy vs...Sergei Golubchik2013-09-192-2/+4
| | * | 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