| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -0/+29 |
| |\ | |||||
| | * | Automerge 5.2->5.3 | unknown | 2011-07-31 | 1 | -0/+1 |
| | |\ | |||||
| | | * | Merge with 5.1 | Michael Widenius | 2011-07-25 | 1 | -0/+1 |
| | | |\ | |||||
| | * | | | Added mytop to distribution (with some small trivial changes to make it workg... | Michael Widenius | 2011-06-27 | 1 | -0/+1 |
| | * | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -5/+18 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -5/+18 |
| | | |\ \ | | | |/ | |||||
| | | | * | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -5/+18 |
| | | | |\ | |||||
| | * | | \ | Merge MWL#180, binlog checksum backport, into MariaDB 5.3-based tree. | unknown | 2011-05-03 | 1 | -0/+3 |
| | |\ \ \ \ | |||||
| | | * | | | | Backport MySQL WL#2540 into MariaDB. | unknown | 2011-05-03 | 1 | -0/+3 |
| | | |/ / / | |||||
| | * | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -1/+10 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -1/+10 |
| | | |\ \ \ | | | |/ / | |||||
| | | | * | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -1/+7 |
| | | | |\ \ | |||||
| | | | * | | | Ignore some linked files | Michael Widenius | 2011-01-30 | 1 | -0/+3 |
| | * | | | | | Added HandlerSocket plugin | Michael Widenius | 2011-02-20 | 1 | -0/+1 |
| * | | | | | | update .bzrignore | Sergei Golubchik | 2011-07-10 | 1 | -0/+33 |
| * | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -23/+16 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Ignore auto-generated files (source_downloads). | Alexander Nozdrin | 2011-06-07 | 1 | -0/+1 |
| | * | | | | | | Ignore auto-generated files. | Alexander Nozdrin | 2011-05-16 | 1 | -0/+1 |
| | * | | | | | | Ignore auto-generated files. | Alexander Nozdrin | 2011-05-11 | 1 | -0/+3 |
| | * | | | | | | Manual merge from 5.1 | Mattias Jonsson | 2011-04-20 | 1 | -0/+9 |
| | |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | | * | | | | | merge | Mattias Jonsson | 2011-04-20 | 1 | -0/+9 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | Bug#11766249 bug#59316: PARTITIONING AND INDEX_MERGE MEMORY LEAK | Mattias Jonsson | 2011-03-25 | 1 | -0/+12 |
| | | | | |_|_|/ | | | |/| | | | |||||
| | * | | | | | | merge mysql-5.1->mysql-5.5 | Georgi Kodinov | 2011-03-28 | 1 | -1/+5 |
| | |\ \ \ \ \ \ | | |/ / / / / | |||||
| | | * | | | | | Added support for VS10. | Georgi Kodinov | 2011-03-28 | 1 | -1/+5 |
| | | |/ / / / | |||||
| | * | | | | | merge mysql-5.5->mysql-5.5-bugteam | Georgi Kodinov | 2010-12-16 | 1 | -0/+2 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | Manual-merge from 5.5-bugfixing. | Ramil Kalimullin | 2010-11-18 | 1 | -0/+8 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | merge | Georgi Kodinov | 2010-10-29 | 1 | -0/+2 |
| | | |\ \ \ \ \ \ | |||||
| | * | | | | | | | | Add VERSION.dep to the bzr ignore list. The file is generated | Davi Arnaut | 2010-12-15 | 1 | -0/+1 |
| | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | | merge | Georgi Kodinov | 2010-11-03 | 1 | -0/+8 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | / / / / | | | |/ / / / | | |/| | | | | |||||
| | | * | | | | | added windows cmake binaries | Georgi Kodinov | 2010-11-03 | 1 | -0/+9 |
| | | |/ / / / | |||||
| * | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -2209/+175 |
| |\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 1 | -9/+11 |
| | |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | | * | | | | rename maria to aria | Sergei Golubchik | 2010-09-12 | 1 | -9/+9 |
| | | * | | | | Automerge with 5.1 | Michael Widenius | 2010-08-25 | 1 | -0/+2 |
| | | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | | * | | | Added verbose mode to recovery | Michael Widenius | 2010-08-18 | 1 | -0/+2 |
| | * | | | | | Improved speed of thr_alarm from O(N) to O(1). thr_alarm is used to handle ti... | Michael Widenius | 2010-07-16 | 1 | -0/+1 |
| | * | | | | | MariaDB 5.2 -> MariaDB 5.3 merge | Sergey Petrunya | 2010-06-26 | 1 | -0/+5 |
| | |\ \ \ \ \ | | |/ / / / | |||||
| | | * | | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -0/+1 |
| | | |\ \ \ \ | | | |/ / / | |||||
| | | | * | | | Fixes after last merge of MySQL 5.1 | Michael Widenius | 2010-05-13 | 1 | -0/+1 |
| | | * | | | | MWL#43 CREATE TABLE options (by Sanja) | Sergei Golubchik | 2010-04-08 | 1 | -0/+1 |
| | | * | | | | pluggable auth with plugin examples | Sergei Golubchik | 2010-03-29 | 1 | -0/+3 |
| | * | | | | | Merge MariaDB-5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-03-20 | 1 | -6/+15 |
| | |\ \ \ \ \ | | |/ / / / | |||||
| | | * | | | | merge 5.1->5.2 | unknown | 2010-02-01 | 1 | -6/+9 |
| | | |\ \ \ \ | | | |/ / / | |||||
| | | | * | | | Patch set contributed by Alex Budovski (MCA) | Michael Widenius | 2010-01-29 | 1 | -6/+6 |
| | | | * | | | Ignore new pbxt symlinks. | unknown | 2009-12-22 | 1 | -0/+3 |
| | | * | | | | Merge with 5.1 | Michael Widenius | 2010-01-04 | 1 | -0/+4 |
| | | |/ / / | |||||
| | | * | | | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes. | unknown | 2009-11-30 | 1 | -0/+1 |
| | | |\ \ \ | |||||
| | | | * \ \ | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -0/+1 |
| | | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | * | | | | Ignore temporary directory | Michael Widenius | 2009-11-30 | 1 | -0/+1 |
| | | |/ / / | |||||
| | * | | | | Subquery optimization backport: | Sergey Petrunya | 2010-02-16 | 1 | -0/+4 |
| | |/ / / | |||||
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |
path: root/.bzrignore