Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge 10.0-base -> 10.0 | unknown | 2013-09-26 | 1 | -9/+11 |
|\ | |||||
| * | merge 5.5 -> 10.0-base | unknown | 2013-09-25 | 1 | -9/+11 |
| |\ | |||||
| | * | MDEV-5037: Server crash on a JOIN on a derived table with join_cache_level > 2 | Sergey Petrunya | 2013-09-20 | 1 | -9/+11 |
* | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -4/+4 |
|\ \ \ | |||||
| * | | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -1/+1 |
| * | | | Push a lot of small fixes to get larger parts to compile | Michael Widenius | 2013-05-21 | 1 | -1/+1 |
| * | | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -2/+2 |
* | | | | 10.0-base merge | Sergei Golubchik | 2013-07-18 | 1 | -0/+1 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | 5.5 merge | Sergei Golubchik | 2013-07-17 | 1 | -0/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | -Run test suite with smaller aria keybuffer size (to make it possible to run ... | Michael Widenius | 2013-06-05 | 1 | -0/+1 |
* | | | | Merge 10.0-base -> 10.0 | unknown | 2013-05-28 | 1 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixed errors and compiler warnings found by buildbot | Michael Widenius | 2013-05-05 | 1 | -2/+2 |
* | | | | 10.0-base merge | Sergei Golubchik | 2013-04-15 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | |||||
| * | | 5.5 merge | Sergei Golubchik | 2013-04-14 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | 5.3 merge | Sergei Golubchik | 2013-04-12 | 1 | -1/+1 |
| | |\ | |||||
| | | * | MDEV-4244 [PATCH] Buffer overruns and use-after-free errors | Sergei Golubchik | 2013-04-06 | 1 | -1/+1 |
* | | | | Merge 10.0-base -> 10.0. | Igor Babaev | 2013-01-10 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Addressed all remaining issues from the review of the patch | Igor Babaev | 2012-12-13 | 1 | -1/+1 |
| * | | | Merge 5.5->5.5-mwl248. | Igor Babaev | 2012-08-29 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| * | | | The pilot implementation of mwl#250: Use the statistics from persistent | Igor Babaev | 2012-04-11 | 1 | -1/+1 |
* | | | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 1 | -1/+1 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Fixed compiler errors | Michael Widenius | 2012-08-14 | 1 | -1/+1 |
| |/ / | |||||
* | | | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6 | Michael Widenius | 2012-08-01 | 1 | -16/+16 |
* | | | Fixed build failures found by buildbot | Michael Widenius | 2012-06-05 | 1 | -1/+1 |
|/ / | |||||
* | | 5.3 merge | Sergei Golubchik | 2012-02-24 | 1 | -4/+8 |
|\ \ | |/ | |||||
| * | Added back MRR counters. The new names are: Handler_mrr_init, | Sergey Petrunya | 2012-02-22 | 1 | -4/+8 |
* | | 5.3.4 merge | Sergei Golubchik | 2012-02-15 | 1 | -2/+21 |
|\ \ | |/ | |||||
| * | Add MRR counters: Handler_mrr_init, Handler_mrr_extra_rowid_sorts, | Sergey Petrunya | 2012-01-23 | 1 | -2/+21 |
* | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -10/+13 |
|\ \ | |/ | |||||
| * | Fixed LP bug #878769. | Igor Babaev | 2011-10-22 | 1 | -1/+2 |
| * | Compiler warning about assigned but not used variables fixed. | unknown | 2011-10-18 | 1 | -2/+3 |
| * | BUG#730133: Wrong result with jkl = 7, BKA, ICP in maria-5.3 + compound index | Sergey Petrunya | 2011-09-13 | 1 | -7/+8 |
* | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -217/+1091 |
|\ \ | |/ | |||||
| * | New status variables: Rows_tmp_read, Handler_tmp_update and Handler_tmp_write | Michael Widenius | 2011-06-27 | 1 | -1/+1 |
| * | Change optimizer_use_mrr=auto|disable|force | Sergey Petrunya | 2011-06-03 | 1 | -4/+5 |
| * | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -1/+3 |
| * | Make EXPLAIN better at displaying MRR/BKA: | Sergey Petrunya | 2011-04-02 | 1 | -1/+50 |
| * | MRR interface: change range_info's type from char* to range_id_t typedef. The... | Sergey Petrunya | 2011-03-04 | 1 | -17/+17 |
| * | Merge fix for BUG#693747 | Sergey Petrunya | 2011-03-04 | 1 | -1/+20 |
| |\ | |||||
| | * | BUG#693747: Assertion multi_range_read.cc:908: int DsMrr_impl::dsmrr_init | Sergey Petrunya | 2011-03-02 | 1 | -1/+20 |
| * | | BUG#707925: Wrong result with join_cache_level=6 optimizer_use_mrr = force (i... | Sergey Petrunya | 2011-03-04 | 1 | -6/+39 |
| |/ | |||||
| * | Fix numerous warnings introduced in the last pushes on Windows | Vladislav Vaintroub | 2011-02-18 | 1 | -3/+3 |
| * | Merge with bugfix | Michael Widenius | 2011-02-18 | 1 | -3/+5 |
| |\ | |||||
| | * | Fix for lp:711565 "Index Condition Pushdown can make a thread hold MyISAM loc... | Michael Widenius | 2011-02-18 | 1 | -1/+1 |
| |/ | |||||
| * | Fix compile error on Windows: instead of round(X) use floor(X+0.5) | Sergey Petrunya | 2010-12-22 | 1 | -1/+1 |
| * | BUG#670417: Diverging results in maria-5.3-mwl128-dsmrr-cpk with join buffer | Sergey Petrunya | 2010-12-20 | 1 | -9/+25 |
| * | BUG#670417: Diverging results in maria-5.3-mwl128-dsmrr-cpk with join buffer | Sergey Petrunya | 2010-12-19 | 1 | -56/+29 |
| * | Fix a compiler warning on sparc32 | Sergey Petrunya | 2010-12-17 | 1 | -0/+7 |
| * | Small code cleanups | Sergey Petrunya | 2010-12-17 | 1 | -2/+3 |
| * | MWL#121-125 DS-MRR improvements | Sergey Petrunya | 2010-12-16 | 1 | -12/+10 |