summaryrefslogtreecommitdiff
path: root/.bzrignore
Commit message (Expand)AuthorAgeFilesLines
* bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-051-0/+11
|\
| * Merge 10.0-mroonga -> 10.0Alexander Barkov2014-10-021-0/+11
| |\
| | * - Changing Mroonga maturnity from STABLE to BETAAlexander Barkov2014-10-021-1/+0
| | * Update Mroonga to the latest version on 2014-09-21T00:33:44+0900Kentoku SHIBA2014-09-211-0/+12
* | | bzr merge -rtag:mariadb-10.0.14 maria/10.0/Nirbhay Choubey2014-09-281-273/+6
|\ \ \ | |/ /
| * | 5.5 mergeSergei Golubchik2014-09-231-274/+7
| |\ \ | | |/ | |/|
| | * tokudb 7.5.0Sergei Golubchik2014-09-231-272/+7
| * | 5.5 mergeSergei Golubchik2014-09-161-4/+4
| |\ \ | | |/
| | * tokudb 7.1.8Sergei Golubchik2014-09-131-4/+4
* | | bzr merge -r4346 maria/10.0 (maria-10.0.13)Nirbhay Choubey2014-08-111-0/+1
|\ \ \ | |/ /
| * | MDEV-6410 Cross-compile fixesSergei Golubchik2014-07-081-0/+1
| |\ \
* | \ \ bzr merge -rtag:mariadb-10.0.12 maria/10.0Nirbhay Choubey2014-06-191-0/+2
|\ \ \ \ | |/ / /
| * | | bzr ignore 'pcre/test*grep'Sergei Golubchik2014-06-091-0/+1
| * | | remove and ignore generated pcre filesSergei Golubchik2014-06-051-0/+1
* | | | Merging changes from maria-5.5-galera andNirbhay Choubey2014-05-221-0/+2
* | | | bzr merge -r3985..3991 codership/5.5Nirbhay Choubey2014-05-211-0/+1
* | | | bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-211-4/+5
|\ \ \ \ | |/ / /
| * | | 5.5 mergeSergei Golubchik2014-05-091-4/+5
| |\ \ \ | | |/ / | |/| / | | |/
| | * after tokudb-7.1.6 mergeSergei Golubchik2014-05-061-4/+4
| | * MDEV-6129: Server crashes during UNION with ORDER BY field IS NULLMichael Widenius2014-04-241-0/+1
* | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-261-1/+1
|\ \ \ | |/ /
| * | 10.0-base mergeSergei Golubchik2014-02-261-1/+1
| |\ \
| | * \ 5.5 mergeSergei Golubchik2014-02-251-1/+1
| | |\ \ | | | |/
| | | * MDEV-5529 Sync libmysqlclient.so symbol versioning across distributionsSergei Golubchik2014-02-191-1/+1
| | * | 5.5 mergeSergei Golubchik2013-11-231-0/+1
| | |\ \ | | | |/
| | | * .bzrignoreSergei Golubchik2013-11-191-0/+1
* | | | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-041-4/+306
|\ \ \ \ | |/ / /
| * | | Merge 10.0-base -> 10.0Alexander Barkov2013-10-151-0/+15
| |\ \ \ | | |/ /
| | * | MDEV-4425 Regexp enhancementsAlexander Barkov2013-10-021-0/+1
| | * | pcre: Removing config.h from the tree, it's a generated file.Alexander Barkov2013-09-271-0/+1
| | * | MDEV-4425 REGEXP enhancementsAlexander Barkov2013-09-261-0/+13
| * | | bzr ignoreSergei Golubchik2013-09-251-0/+3
| * | | 10.0-base merge.Sergei Golubchik2013-09-211-4/+288
| |\ \ \ | | |/ /
| | * | 5.5 merge and fixes for compiler/test errorsSergei Golubchik2013-09-181-4/+288
| | |\ \ | | | |/
| | | * .bzrignoreSergei Golubchik2013-09-091-0/+286
| | | * remove PBXTSergei Golubchik2013-08-301-4/+0
| | | * start using jemallocSergei Golubchik2013-08-301-0/+2
* | | | Merged revisions 3409..3411 from mariadb-galera-5.5Seppo Jaakola2013-10-061-0/+3
* | | | Merge 10.0 to galera-10.0Jan Lindström2013-09-031-0/+1
|\ \ \ \ | |/ / /
| * | | 10.0-base mergeSergei Golubchik2013-07-181-0/+1
| |\ \ \ | | |/ /
| | * | 5.5 mergeSergei Golubchik2013-07-171-0/+1
| | |\ \ | | | |/
| | | * mysql-5.5.32 mergeSergei Golubchik2013-07-161-0/+1
| | | |\
| | | | * A bit more intelligent processing of .in files in mysql-test/collectionsBjorn Munch2013-01-151-0/+2
* | | | | Merged with lp:maria revision #3766Seppo Jaakola2013-07-131-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | 10.0-base mergeSergei Golubchik2013-06-061-0/+3
| |\ \ \ \ | | |/ / /
| | * | | 5.5 mergeSergei Golubchik2013-06-061-0/+3
| | |\ \ \ | | | |/ /
| | | * | 5.3 merge.Sergei Golubchik2013-05-201-0/+2
| | | |\ \
| | | | * \ 5.2 mergeSergei Golubchik2013-05-201-6/+1
| | | | |\ \
| | | | | * \ 5.1 mergeSergei Golubchik2013-05-201-0/+1
| | | | | |\ \
| | | | | | * | MDEV-4280: Assertion `empty_size == empty_size_on_page' failure in ma_blockre...Michael Widenius2013-05-111-0/+1