| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -2/+14 |
| |\ | |||||
| | * | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -5/+7 |
| | |\ | |||||
| | | * | Merge with 5.1 | Michael Widenius | 2011-11-30 | 1 | -1/+1 |
| | | |\ | |||||
| | | | * | Fixed compiler warnings | Michael Widenius | 2011-11-30 | 1 | -1/+1 |
| | | * | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -4/+6 |
| | | |\ \ | | | |/ | |||||
| | | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -4/+6 |
| | | | |\ | |||||
| * | | | \ | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -13/+18 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge. | Igor Babaev | 2011-10-28 | 1 | -6/+5 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge. | Igor Babaev | 2011-06-01 | 1 | -6/+5 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Backported the test case for bug 43617 fixed by the patch for bug 42580. | Igor Babaev | 2011-05-27 | 1 | -6/+5 |
| | * | | | | | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ... | Michael Widenius | 2011-09-23 | 1 | -4/+4 |
| | * | | | | | | BUG#834514: Assertion `!table || (!table->read_set || bitmap_is_set(...' with... | Sergey Petrunya | 2011-09-03 | 1 | -3/+9 |
| * | | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -13/+4 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge 5.1 => 5.5 | Norvald H. Ryeng | 2011-08-30 | 1 | -2/+3 |
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | | * | | | | | | Bug#11765254 - 58200: ASSERTION FAILED: PARAM.SORT_LENGTH WHEN | Norvald H. Ryeng | 2011-08-30 | 1 | -2/+3 |
| | * | | | | | | | merge 5.1 => 5.5 | Tor Didriksen | 2011-08-29 | 1 | -11/+0 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | | * | | | | | | Bug#12856915 VALGRIND FAILURE IN FILESORT/CREATE_SORT_INDEX | Tor Didriksen | 2011-08-25 | 1 | -11/+0 |
| | | * | | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| * | | | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -86/+162 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| | * | | | | | | | | Buildbot fixes: | Sergey Petrunya | 2011-06-03 | 1 | -1/+1 |
| | | |_|_|/ / / / | |/| | | | | | | |||||
| | * | | | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -29/+18 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | lp:730637 - Valgrind warnings in 5.1-micro | Sergei Golubchik | 2011-03-07 | 1 | -2/+4 |
| | | * | | | | | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -29/+16 |
| | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | | Merge with 5.3 main | Michael Widenius | 2011-05-16 | 1 | -3/+27 |
| | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | MWL#89 | unknown | 2011-03-01 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | | |||||
| | | * | | | | | | | Merge MWL#89 into 5.3 main. | unknown | 2011-01-11 | 1 | -3/+27 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | Fix LP BUG#680943 | unknown | 2010-12-02 | 1 | -3/+27 |
| | * | | | | | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -4/+3 |
| | |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | / / | | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| | * | | | | | | | | Fixed compiler warnings | Michael Widenius | 2011-02-25 | 1 | -1/+1 |
| | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | | Merge | Igor Babaev | 2010-12-27 | 1 | -46/+104 |
| | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge: mwl#24+mwl#21 5.1->5.2 | Igor Babaev | 2010-12-24 | 1 | -46/+104 |
| | | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | | | * | | | | | | Addressed the feedback from the review of Monty on the cumulative patch for | Igor Babaev | 2010-12-19 | 1 | -38/+44 |
| | | | * | | | | | | MWL #21: "index_merge: non-ROR intersection". | Igor Babaev | 2010-12-01 | 1 | -0/+1 |
| | | | * | | | | | | An implementation of index intersect via a modified Unique class. | Igor Babaev | 2010-09-13 | 1 | -31/+82 |
| | | | | |_|_|_|/ | | | |/| | | | | |||||
| | * | | | | | | | MWL#121-124 DS-MRR support for key-ordered retrieval, etc | Sergey Petrunya | 2010-11-01 | 1 | -5/+10 |
| | |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| | | * | | | | | | BUG#625841: Assertion `!table || (!table->read_set || bitmap_is_set | Sergey Petrunya | 2010-09-15 | 1 | -5/+10 |
| * | | | | | | | | post-merge fixes. | Sergei Golubchik | 2011-07-02 | 1 | -0/+1 |
| * | | | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -8/+25 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| | * | | | | | | | Bug #11747102 30771: LOG MORE INFO ABOUT THREADS KILL'D AND SORT ABORTED MESS... | Tor Didriksen | 2011-02-24 | 1 | -2/+5 |
| | * | | | | | | | Bug #36022 please log more information about "Sort aborted" queries | Tor Didriksen | 2011-02-02 | 1 | -2/+21 |
| | * | | | | | | | Remove configuration preprocessor symbols 'THREAD' | Magne Mahre | 2011-01-11 | 1 | -5/+1 |
| * | | | | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -0/+2 |
| * | | | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -22/+41 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / | |||||
| | * | | | | | | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 1 | -7/+17 |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / / | |||||
| | | * | | | | Fixed bug #607566. | Igor Babaev | 2010-07-19 | 1 | -3/+5 |
| | | * | | | | Merge | Igor Babaev | 2010-07-17 | 1 | -2/+2 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Fixed bug #604503. | Igor Babaev | 2010-07-17 | 1 | -2/+2 |
| | | * | | | | | Fix for LP#588251: doStartTableScan() result not checked. | Michael Widenius | 2010-07-17 | 1 | -1/+2 |
| | | |/ / / / | |||||
| | | * | | | | Fixed bug #603654. | Igor Babaev | 2010-07-13 | 1 | -1/+8 |
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |