Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -2/+2 |
|\ | |||||
| * | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -2/+2 |
* | | Fixed errors and compiler warnings found by buildbot | Michael Widenius | 2013-05-05 | 1 | -2/+2 |
* | | 5.5 merge | Sergei Golubchik | 2013-03-27 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | 5.3->5.5 merge | Sergei Golubchik | 2013-03-10 | 1 | -1/+1 |
| |\ | |||||
| | * | Fix typo (clang issued warning that =+ was used where += was intended) | Vladislav Vaintroub | 2013-03-06 | 1 | -1/+1 |
* | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -3/+3 |
* | | | pre-merge | unknown | 2012-12-23 | 1 | -493/+495 |
|\ \ \ | |||||
| * | | | backport to 5.5 dyncol changes and names support | unknown | 2012-12-23 | 1 | -2/+2 |
| * | | | Cassandra storage engine: BKA support | Sergey Petrunya | 2012-08-27 | 1 | -1/+4 |
* | | | | Merge maria-5.5-mwl248 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | Addressed all remaining issues from the review of the patch | Igor Babaev | 2012-12-13 | 1 | -1/+2 |
| * | | | | Merge 5.5 -> 5.5-mwl248. | Igor Babaev | 2012-11-02 | 1 | -1/+1 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Merge 5.5 -> mwl248 | Igor Babaev | 2012-09-08 | 1 | -3/+4 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge 5.5 -> 5.5-mwl248. | Igor Babaev | 2012-04-11 | 1 | -7/+11 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | * | | | | The pilot implementation of mwl#250: Use the statistics from persistent | Igor Babaev | 2012-04-11 | 1 | -1/+1 |
* | | | | | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -4/+25 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | 5.3 merge | Sergei Golubchik | 2012-10-18 | 1 | -4/+25 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | |_|/ | | |/| | | |||||
| | * | | | Fixed LP bug #1058071 (mdev-564). | Igor Babaev | 2012-09-29 | 1 | -4/+25 |
* | | | | | SHOW EXPLAIN: merge with 5.5-main | Sergey Petrunya | 2012-10-06 | 1 | -3/+3 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Merge of recent changes in MWL#182 in 5.3 with {Merge of MWL#182 with 5.5} | Sergey Petrunya | 2012-05-17 | 1 | -3/+3 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | MWL#182: Explain running statements | Sergey Petrunya | 2012-04-26 | 1 | -3/+3 |
* | | | | | 5.3 merge | Sergei Golubchik | 2012-08-31 | 1 | -3/+4 |
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | |||||
| * | | | Fix bugs in BatchedKeyAccess that show up when working with a | Sergey Petrunya | 2012-08-28 | 1 | -3/+4 |
| |/ / | |||||
* | | | Merge mariadb 5.3->mariadb 5.5 | unknown | 2012-03-24 | 1 | -7/+11 |
|\ \ \ | |/ / | | / | |/ |/| | |||||
| * | Speedup: | Michael Widenius | 2012-03-23 | 1 | -7/+11 |
* | | 5.3 merge | Sergei Golubchik | 2012-02-24 | 1 | -6/+6 |
|\ \ | |/ | |||||
| * | Changed names of statistic variables and counting matches instaed of rejected... | unknown | 2012-02-22 | 1 | -6/+6 |
* | | 5.3 merge | Sergei Golubchik | 2012-02-21 | 1 | -2/+20 |
|\ \ | |/ | |||||
| * | Counters for Index Condition Pushdown added (MDEV-130). | unknown | 2012-02-16 | 1 | -2/+20 |
* | | 5.3.4 merge | Sergei Golubchik | 2012-02-15 | 1 | -10/+12 |
|\ \ | |/ | |||||
| * | Fixed LP bug #925985. | Igor Babaev | 2012-02-13 | 1 | -0/+2 |
| * | Fixed LP bug #922971. | Igor Babaev | 2012-01-28 | 1 | -10/+10 |
* | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Subquery code cleanups: | Sergey Petrunya | 2011-11-25 | 1 | -1/+1 |
* | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -18/+58 |
|\ \ | |/ | |||||
| * | Fixed LP bug #881318. | Igor Babaev | 2011-10-25 | 1 | -1/+18 |
| * | Automerge. | Sergey Petrunya | 2011-09-08 | 1 | -3/+16 |
| |\ | |||||
| | * | BUG#830993: Crash in end_read_record with derived table | Sergey Petrunya | 2011-09-08 | 1 | -3/+16 |
| * | | Fixed lp:828514 "Assertion `! is_set()' failed in Diagnostics_area::set_ok_st... | Michael Widenius | 2011-09-03 | 1 | -14/+24 |
| |/ | |||||
* | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -1144/+2425 |
|\ \ | |/ | |||||
| * | Fixed LP bug #802860. | Igor Babaev | 2011-06-28 | 1 | -5/+22 |
| * | Merge MWL#90 into 5.3-main | Sergey Petrunya | 2011-04-30 | 1 | -82/+137 |
| |\ | |||||
| | * | Merge MWL#90 with main 5.3 tree | Sergey Petrunya | 2011-04-02 | 1 | -82/+137 |
| | |\ | |||||
| | | * | Make first_linear_tab()/next_linear_tab() use named constants instead of TRUE... | Sergey Petrunya | 2011-03-25 | 1 | -9/+13 |
| | | * | MWL#90: Address review feedback part #9: | Sergey Petrunya | 2011-03-22 | 1 | -1/+7 |
| | | * | MWL#90: Address review feedback part #8 | Sergey Petrunya | 2011-03-22 | 1 | -1/+1 |
| | | * | MWL#90: Address review feedback part #7 | Sergey Petrunya | 2011-03-22 | 1 | -13/+33 |
| | | * | MWL#90: Address review feedback part #5 | Sergey Petrunya | 2011-03-22 | 1 | -3/+9 |
| | | * | MWL#90: Address review feedback part #2 | Sergey Petrunya | 2011-03-21 | 1 | -0/+8 |