| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | |/ / | |||||
| | * | | Added ignore for symlinked build file | Michael Widenius | 2009-10-30 | 1 | -0/+1 |
| | * | | Merge maria-5.1 -> maria-5.1-table-elimination | Sergey Petrunya | 2009-08-14 | 1 | -0/+1 |
| | |\ \ | |||||
| | | * | | MWL#17: Table elimination | Sergey Petrunia | 2009-06-25 | 1 | -0/+1 |
| | * | | | Merge of Percona XtraDB into MariaDB. | unknown | 2009-06-11 | 1 | -0/+15 |
| | |\ \ \ | | |/ / | |/| | | |||||
| | | * | | XtraDB after-merge fix: Fix building from storage/xtradb/ instead of storage/... | unknown | 2009-06-09 | 1 | -0/+15 |
| | * | | | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -0/+2 |
| | |\ \ \ | | |/ / | |/| | | |||||
| | | * | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -0/+2 |
| | | |\ \ | |||||
| | | * \ \ | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. | Guilhem Bichot | 2009-02-12 | 1 | -0/+4 |
| | | |\ \ \ | |||||
| | * | | | | | Ignore generated file event-config.h | Michael Widenius | 2009-03-18 | 1 | -0/+1 |
| | * | | | | | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -0/+5 |
| | |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | |||||
| | * | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my... | Guilhem Bichot | 2008-12-10 | 1 | -1258/+98 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -0/+12 |
| | | |\ \ \ \ | |||||
| | | * | | | | | Added versioning of Maria index | Michael Widenius | 2008-06-26 | 1 | -0/+1 |
| | | * | | | | | Cleanup & Ignore | Michael Widenius | 2008-06-02 | 1 | -1258/+31 |
| | | * | | | | | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -13/+20 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | Merge of changes in MyISAM since December 16 -> April 1 | unknown | 2008-04-01 | 1 | -0/+1 |
| | | * | | | | | | Fixed problems with ma_test2 and mi_test2 on high-byte-first system | unknown | 2008-02-21 | 1 | -0/+1 |
| | | * | | | | | | ignore: | unknown | 2008-02-03 | 1 | -0/+1 |
| | | * | | | | | | storage/maria/unittest/ma_test_all-t | unknown | 2008-01-29 | 1 | -0/+3 |
| | | * | | | | | | Allow index on 'CHAR(0) NULL' columns | unknown | 2008-01-21 | 1 | -0/+1 |
| | | * | | | | | | Windows fixes | unknown | 2008-01-10 | 1 | -0/+5 |
| | | * | | | | | | after merge | unknown | 2007-12-28 | 1 | -0/+1 |
| | | * | | | | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2007-12-16 | 1 | -0/+54 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | Added error HA_ERR_FILE_TOO_SHORT to be used when files are shorter than expe... | unknown | 2007-12-04 | 1 | -0/+2 |
| | | | * | | | | | | make maria more pluggable | unknown | 2007-10-12 | 1 | -0/+3 |
| | | | * | | | | | | Fixed merge problems. | unknown | 2007-09-27 | 1 | -0/+4 |
| | | | * | | | | | | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2007-09-27 | 1 | -0/+52 |
| | | | |\ \ \ \ \ \ | |||||
| | | | | * | | | | | | Added maria_commit() and maria_begin() to be used with external tests | unknown | 2007-08-29 | 1 | -0/+3 |
| | | | | * | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 | unknown | 2007-07-07 | 1 | -0/+50 |
| | | | | |\ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2007-07-04 | 1 | -0/+1 |
| | | | | | |\ \ \ \ \ \ | |||||
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |
path: root/.bzrignore