summaryrefslogtreecommitdiff
path: root/.bzrignore
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | added windows cmake binariesGeorgi Kodinov2010-11-031-0/+9
| | |/ / / /
* | | | | | merge.Sergei Golubchik2010-11-251-2209/+175
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | 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
| | | |\ \ \ | | | | | |/ | | | | |/|
| | * | | | 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
| | |\ \ \
| | * \ \ \ 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 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
| | | | |\ \ \ \ \ \ \
View Lorry Controller Status