summaryrefslogtreecommitdiff
path: root/.bzrignore
Commit message (Expand)AuthorAgeFilesLines
* Patch set contributed by Alex Budovski (MCA)Michael Widenius2010-01-291-6/+6
* Ignore new pbxt symlinks.unknown2009-12-221-0/+3
* 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
|/ /
* | 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
| |\ \ \
| * \ \ \ Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rplunknown2008-02-281-8/+9
| |\ \ \ \
| | * | | | Add C version of safe_process unknown2008-01-181-0/+1
* | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my...Guilhem Bichot2008-12-101-1258/+98
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Merged 5.1 with maria 5.1Michael Widenius2008-10-101-0/+12
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Added versioning of Maria indexMichael Widenius2008-06-261-0/+1
| * | | | | Cleanup & IgnoreMichael Widenius2008-06-021-1258/+31
| * | | | | Merge mysql.com:/home/my/mysql-5.1unknown2008-04-281-13/+20
| |\ \ \ \ \
| * | | | | | Merge of changes in MyISAM since December 16 -> April 1unknown2008-04-011-0/+1
| * | | | | | Fixed problems with ma_test2 and mi_test2 on high-byte-first systemunknown2008-02-211-0/+1
| * | | | | | ignore:unknown2008-02-031-0/+1
| * | | | | | storage/maria/unittest/ma_test_all-tunknown2008-01-291-0/+3
| * | | | | | Allow index on 'CHAR(0) NULL' columnsunknown2008-01-211-0/+1
| * | | | | | Windows fixesunknown2008-01-101-0/+5
| * | | | | | after mergeunknown2007-12-281-0/+1
| * | | | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2007-12-161-0/+54
| |\ \ \ \ \ \
| | * | | | | | Added error HA_ERR_FILE_TOO_SHORT to be used when files are shorter than expe...unknown2007-12-041-0/+2
| | * | | | | | make maria more pluggableunknown2007-10-121-0/+3
| | * | | | | | Fixed merge problems.unknown2007-09-271-0/+4
| | * | | | | | Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-09-271-0/+52
| | |\ \ \ \ \ \
| | | * | | | | | Added maria_commit() and maria_begin() to be used with external testsunknown2007-08-291-0/+3
| | | * | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-07-071-0/+50
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-mariaunknown2007-07-041-0/+1
| | | | |\ \ \ \ \ \
| | | | | * | | | | | After merge fixesunknown2007-07-011-0/+1
| | | | * | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-06-271-2/+51
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / /
| | | | | * | | | | | Fixed LSN codding to allow code allunknown2007-06-151-0/+1
| | | | | * | | | | | Fixed that ma_test_all works with -T (simple transaction/logging support)unknown2007-06-041-0/+2
| | | | | * | | | | | After merge fixesunknown2007-04-191-0/+9
| | | | | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-mariaunknown2007-04-051-0/+9
| | | | | |\ \ \ \ \ \