summaryrefslogtreecommitdiff
path: root/.bzrignore
Commit message (Expand)AuthorAgeFilesLines
* Merge with MariaDB 5.2Michael Widenius2011-05-101-5/+18
|\
| * Merge with MariaDB 5.1Michael Widenius2011-05-031-5/+18
| |\
| | * Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-5/+18
| | |\
| | | * mergeMattias Jonsson2011-04-201-0/+9
| | | |\
| | | | * Bug#11766249 bug#59316: PARTITIONING AND INDEX_MERGE MEMORY LEAKMattias Jonsson2011-03-251-0/+12
| | | * | Added support for VS10.Georgi Kodinov2011-03-281-1/+5
| | | |/
* | | | Merge MWL#180, binlog checksum backport, into MariaDB 5.3-based tree.unknown2011-05-031-0/+3
|\ \ \ \
| * | | | Backport MySQL WL#2540 into MariaDB.unknown2011-05-031-0/+3
| |/ / /
* | | | Merge with 5.2Michael Widenius2011-03-091-1/+10
|\ \ \ \ | |/ / /
| * | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-1/+10
| |\ \ \ | | |/ /
| | * | Merge with MySQL 5.1.55Michael Widenius2011-02-201-1/+7
| | |\ \ | | | |/
| | | * added windows cmake binariesGeorgi Kodinov2010-11-031-0/+9
| | * | Ignore some linked filesMichael Widenius2011-01-301-0/+3
* | | | Added HandlerSocket pluginMichael Widenius2011-02-201-0/+1
* | | | Merge 5.2->5.3Sergey Petrunya2010-10-101-9/+11
|\ \ \ \ | |/ / /
| * | | rename maria to ariaSergei Golubchik2010-09-121-9/+9
| * | | Automerge with 5.1Michael Widenius2010-08-251-0/+2
| |\ \ \ | | |/ /
| | * | Added verbose mode to recoveryMichael Widenius2010-08-181-0/+2
* | | | Improved speed of thr_alarm from O(N) to O(1). thr_alarm is used to handle ti...Michael Widenius2010-07-161-0/+1
* | | | MariaDB 5.2 -> MariaDB 5.3 merge Sergey Petrunya2010-06-261-0/+5
|\ \ \ \ | |/ / /
| * | | merge 5.1->5.2Sergei Golubchik2010-06-011-0/+1
| |\ \ \ | | |/ /
| | * | Fixes after last merge of MySQL 5.1Michael Widenius2010-05-131-0/+1
| * | | MWL#43 CREATE TABLE options (by Sanja)Sergei Golubchik2010-04-081-0/+1
| * | | pluggable auth with plugin examplesSergei Golubchik2010-03-291-0/+3
* | | | Merge MariaDB-5.2 -> MariaDB 5.3Sergey Petrunya2010-03-201-6/+15
|\ \ \ \ | |/ / /
| * | | merge 5.1->5.2unknown2010-02-011-6/+9
| |\ \ \ | | |/ /
| | * | Patch set contributed by Alex Budovski (MCA)Michael Widenius2010-01-291-6/+6
| | * | Ignore new pbxt symlinks.unknown2009-12-221-0/+3
| * | | Merge with 5.1Michael Widenius2010-01-041-0/+4
| |/ /
| * | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.unknown2009-11-301-0/+1
| |\ \
| | * \ Merge with MySQL 5.1, with following additions:unknown2009-11-161-0/+1
| | |\ \ | | | |/
| | | * WL#4259 - Debug Sync FacilityIngo Struewing2009-09-291-0/+1
| | | * Ignore auto-generated file: libmysqld/examples/mysqltest.ccAlexander Nozdrin2009-08-121-0/+1
| * | | Ignore temporary directoryMichael Widenius2009-11-301-0/+1
| |/ /
* | | Subquery optimization backport:Sergey Petrunya2010-02-161-0/+4
|/ /
* | Added ignore for symlinked build fileMichael Widenius2009-10-301-0/+1
* | Merge maria-5.1 -> maria-5.1-table-eliminationSergey Petrunya2009-08-141-0/+1
|\ \
| * | MWL#17: Table eliminationSergey Petrunia2009-06-251-0/+1
* | | Merge of Percona XtraDB into MariaDB.unknown2009-06-111-0/+15
|\ \ \ | |/ / |/| |
| * | XtraDB after-merge fix: Fix building from storage/xtradb/ instead of storage/...unknown2009-06-091-0/+15
* | | bzr merge from guilhem's maria tree to our local 5.1Michael Widenius2009-04-251-0/+2
|\ \ \ | |/ / |/| |
| * | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-011-0/+2
| |\ \ | | |/
| | * Bug#40446 - mysql-test-run --gcov is brokenIngo Struewing2009-02-271-0/+2
| * | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.Guilhem Bichot2009-02-121-0/+4
| |\ \ | | |/
* | | Ignore generated file event-config.hMichael Widenius2009-03-181-0/+1
* | | Merge with base MySQL 5.1Michael Widenius2009-02-151-0/+5
|\ \ \ | |/ / |/| / | |/
| * merge 5.1 --> 5.1-rplAlfranio Correia2008-12-131-0/+25
| |\
| * \ Merge 5.1 main -> 5.1-rplHe Zhenxing2008-09-061-0/+3
| |\ \
| * | | Add doxygen files to .bzrignoreSven Sandberg2008-07-241-0/+3
| * | | Merge 5.1->5.1-rplMagnus Svensson2008-05-301-0/+9
| |\ \ \