summaryrefslogtreecommitdiff
path: root/.bzrignore
Commit message (Expand)AuthorAgeFilesLines
* cleanupsSergei Golubchik2011-10-191-0/+1
* merge with 5.3Sergei Golubchik2011-10-191-0/+29
|\
| * Automerge 5.2->5.3unknown2011-07-311-0/+1
| |\
| | * Merge with 5.1Michael Widenius2011-07-251-0/+1
| | |\
| * | | Added mytop to distribution (with some small trivial changes to make it workg...Michael Widenius2011-06-271-0/+1
| * | | 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
| | | |\
| * | | \ 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
| | | |\ \
| | | * | | Ignore some linked filesMichael Widenius2011-01-301-0/+3
| * | | | | Added HandlerSocket pluginMichael Widenius2011-02-201-0/+1
* | | | | | update .bzrignoreSergei Golubchik2011-07-101-0/+33
* | | | | | 5.5-mergeSergei Golubchik2011-07-021-23/+16
|\ \ \ \ \ \
| * | | | | | Ignore auto-generated files (source_downloads).Alexander Nozdrin2011-06-071-0/+1
| * | | | | | Ignore auto-generated files.Alexander Nozdrin2011-05-161-0/+1
| * | | | | | Ignore auto-generated files.Alexander Nozdrin2011-05-111-0/+3
| * | | | | | Manual merge from 5.1Mattias Jonsson2011-04-201-0/+9
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | mergeMattias Jonsson2011-04-201-0/+9
| | |\ \ \ \ \
| | | * | | | | Bug#11766249 bug#59316: PARTITIONING AND INDEX_MERGE MEMORY LEAKMattias Jonsson2011-03-251-0/+12
| | | | |_|_|/ | | | |/| | |
| * | | | | | merge mysql-5.1->mysql-5.5Georgi Kodinov2011-03-281-1/+5
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Added support for VS10.Georgi Kodinov2011-03-281-1/+5
| | |/ / / /
| * | | | | merge mysql-5.5->mysql-5.5-bugteamGeorgi Kodinov2010-12-161-0/+2
| |\ \ \ \ \
| | * \ \ \ \ Manual-merge from 5.5-bugfixing.Ramil Kalimullin2010-11-181-0/+8
| | |\ \ \ \ \
| | * \ \ \ \ \ mergeGeorgi Kodinov2010-10-291-0/+2
| | |\ \ \ \ \ \
| * | | | | | | | Add VERSION.dep to the bzr ignore list. The file is generatedDavi Arnaut2010-12-151-0/+1
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | mergeGeorgi Kodinov2010-11-031-0/+8
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | / / / / | | | |/ / / / | | |/| | | |
| | * | | | | 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
| | |/ / /