| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | less boilerplate code - move common operations to wrappers | Sergei Golubchik | 2011-07-14 | 1 | -23/+0 |
| * | post-merge fixes. | Sergei Golubchik | 2011-07-02 | 2 | -3/+3 |
| * | 5.5-merge | Sergei Golubchik | 2011-07-02 | 6 | -78/+50 |
| |\ | |||||
| | * | Manual merge from 5.1 | Mattias Jonsson | 2011-04-20 | 2 | -4/+4 |
| | |\ | |||||
| | | * | Bug#11766249 bug#59316: PARTITIONING AND INDEX_MERGE MEMORY LEAK | Mattias Jonsson | 2011-03-25 | 2 | -6/+5 |
| | * | | Fix for BUG#59894 | Guilhem Bichot | 2011-02-11 | 1 | -3/+3 |
| | * | | Remove configuration preprocessor symbols 'THREAD' | Magne Mahre | 2011-01-11 | 1 | -2/+0 |
| | * | | WL#5665: Removal of the autotools-based build system | Davi Arnaut | 2010-11-20 | 2 | -68/+0 |
| | * | | Merge of mysql-5.1-bugteam into mysql-5.5-bugteam. | Davi Arnaut | 2010-11-16 | 1 | -1/+1 |
| | |\ \ | | |/ | |||||
| | | * | Bug#58057: 5.1 libmysql/libmysql.c unused variable/compile failure | Davi Arnaut | 2010-11-10 | 1 | -1/+1 |
| | | * | Bug#45288: pb2 returns a lot of compilation warnings | Davi Arnaut | 2010-10-20 | 1 | -1/+1 |
| | * | | Bug#49938: Failing assertion: inode or deadlock in fsp/fsp0fsp.c | Davi Arnaut | 2010-10-06 | 2 | -0/+17 |
| | * | | Bug #57002 Assert in upgrade_shared_lock_to_exclusive() | Jon Olav Hauglid | 2010-10-06 | 1 | -2/+25 |
| | * | | Bug #56292 Deadlock with ALTER TABLE and MERGE tables | Jon Olav Hauglid | 2010-09-08 | 1 | -0/+2 |
| * | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -2/+2 |
| * | | | merge. | Sergei Golubchik | 2010-11-25 | 8 | -27/+71 |
| |\ \ \ | |/ / |/| | | |||||
| | * | | Automerge with 5.2 | Michael Widenius | 2010-11-05 | 3 | -14/+11 |
| | |\ \ | |||||
| | | * \ | Automatic merge with 5.1 | Michael Widenius | 2010-11-04 | 3 | -14/+11 |
| | | |\ \ | |||||
| | | | * | | Fix for: LP #634955: Assert in _ma_update_at_original_place() | Michael Widenius | 2010-11-02 | 3 | -14/+11 |
| | * | | | | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 2 | -10/+5 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 2 | -7/+2 |
| | | |\ \ \ | | | |/ / | |||||
| | | | * | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 2 | -7/+2 |
| | | | |\ \ | | | | |/ | |||||
| | | * | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -3/+3 |
| | | |\ \ \ | | | |/ / | |||||
| | | | * | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -3/+3 |
| | | | |\ \ | |||||
| | * | | | | | Improved speed of thr_alarm from O(N) to O(1). thr_alarm is used to handle ti... | Michael Widenius | 2010-07-16 | 4 | -8/+8 |
| | |/ / / / | |||||
| | * | | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 2 | -60/+89 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | After-merge fixes for MySQL 5.1.46 merge into MariaDB: result file update and... | unknown | 2010-04-28 | 1 | -2/+3 |
| | | * | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 2 | -60/+88 |
| | | |\ \ \ | |||||
| | * | | | | | Maria WL#61 | unknown | 2010-04-01 | 1 | -0/+17 |
| | |/ / / / | |||||
| | * | | | | Removed compiler warning | Michael Widenius | 2010-03-30 | 2 | -1/+2 |
| | * | | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -2/+1 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 3 | -10/+5 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Apply Igor's fix: | Sergey Petrunya | 2009-09-18 | 1 | -1/+1 |
| | * | | | | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 5 | -22/+48 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Fixed problems in merge | Michael Widenius | 2009-05-19 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | We are now using Valgrind rather than purify, and have for quite some time. | unknown | 2009-05-06 | 1 | -1/+1 |
| | * | | | | | | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -4/+4 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 3 | -7/+89 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria. | Guilhem Bichot | 2009-03-11 | 1 | -9/+18 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fixed warnings and errors discovered by pushbuild2 | Michael Widenius | 2008-12-04 | 1 | -3/+3 |
| | * | | | | | | | | | | | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 5 | -2/+37 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | wt: comments, OOM checks, test case for deadlock detection | Sergei Golubchik | 2008-08-28 | 1 | -1/+1 |
| | * | | | | | | | | | | | | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 2 | -0/+7 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2007-12-16 | 2 | -5/+8 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2007-09-27 | 2 | -5/+8 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | Fixed several bugs found by running *.test with maria engine | unknown | 2007-09-03 | 1 | -1/+2 |
| | | | * | | | | | | | | | | | | | Merged with mysql-5.1 main tree. | unknown | 2007-07-02 | 1 | -10/+10 |
| | | | * | | | | | | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 | unknown | 2007-06-27 | 2 | -10/+12 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | | | | | merge from MyISAM into Maria (last step of merge of 5.1 into Maria). | unknown | 2007-03-01 | 1 | -8/+10 |
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |