Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 5.3->5.5 | Igor Babaev | 2012-03-17 | 1 | -0/+47 |
|\ | |||||
| * | Merge 5.2->5.3 | unknown | 2012-03-14 | 1 | -0/+47 |
| |\ | |||||
| | * | Fixed LP bug #884175. | Igor Babaev | 2012-03-08 | 1 | -0/+47 |
* | | | Merge 5.3->5.5. | Igor Babaev | 2012-03-01 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Fixed LP bug #939009. | Igor Babaev | 2012-02-24 | 1 | -1/+1 |
* | | | 5.3.4 merge | Sergei Golubchik | 2012-02-15 | 1 | -0/+64 |
|\ \ \ | |/ / | |||||
| * | | Merge 5.2->5.3 in preparation for the release of mariadb-5.3.4-rc. | Igor Babaev | 2012-02-01 | 1 | -1/+64 |
| |\ \ | | |/ | |||||
| | * | Fixed LP bug #879860. | Igor Babaev | 2011-12-27 | 1 | -0/+23 |
| | * | Fixed LP bug #904345. | Igor Babaev | 2011-12-27 | 1 | -1/+39 |
* | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -6/+12 |
|\ \ \ | |/ / | |||||
| * | | Made the optimizer switch flags 'outer_join_with_cache', 'semijoin_with_cache' | Igor Babaev | 2011-12-15 | 1 | -0/+3 |
| * | | Make subquery Materialization, as well as semi-join Materialization be shown | Sergey Petrunya | 2011-12-05 | 1 | -6/+6 |
| * | | Set new default values for the optimizer switch flags 'derived_merge' | Igor Babaev | 2011-11-26 | 1 | -0/+3 |
* | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -0/+9 |
|\ \ \ | |/ / | |||||
| * | | Merge with 5.2 | Michael Widenius | 2011-09-10 | 1 | -0/+9 |
| |\ \ | | |/ | |||||
| | * | LP BUG#813418 fix. | unknown | 2011-09-08 | 1 | -0/+10 |
* | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -3/+207 |
|\ \ \ | |/ / | |||||
| * | | Made the optimizer switches 'derived_merge' and 'derived_with_keys' | Igor Babaev | 2011-07-21 | 1 | -1/+2 |
| * | | Merge of mwl #106 into 5.3. | Igor Babaev | 2011-06-15 | 1 | -2/+1 |
| |\ \ | |||||
| | * \ | Merge | Igor Babaev | 2011-05-20 | 1 | -2/+1 |
| | |\ \ | |||||
| | | * \ | Merged the code of MWL#106 into 5.3 | Igor Babaev | 2011-05-16 | 1 | -2/+1 |
| | | |\ \ | |||||
| * | | \ \ | merge with 5.1-micro | Sergei Golubchik | 2011-06-07 | 1 | -1/+55 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | revert a suggested "optimization" that introduced a bug | Sergei Golubchik | 2011-06-06 | 1 | -1/+55 |
| * | | | | | Merge with 5.3 main | Michael Widenius | 2011-05-16 | 1 | -5/+5 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | MWL#89 | unknown | 2011-03-30 | 1 | -5/+5 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | MWL#89 | unknown | 2011-03-01 | 1 | -5/+5 |
| | | |\ \ \ \ | |||||
| * | | \ \ \ \ | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -0/+20 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -0/+13 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Bug #46680: Assertion failed in file item_subselect.cc, line 305 crashing on ... | Sergey Petrunya | 2010-12-25 | 1 | -0/+151 |
| | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge. | Igor Babaev | 2010-10-30 | 1 | -2/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | MWL#128: Added into EXPLAIN output info about types of the used join buffers and | Igor Babaev | 2010-10-18 | 1 | -2/+2 |
| | | |_|_|/ | | |/| | | | |||||
* | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -0/+58 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | 5.1 -> 5.5 merge | Sergey Glukhov | 2011-04-12 | 1 | -0/+11 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Bug#11766270 59343: YEAR(4): INCORRECT RESULT AND VALGRIND WARNINGS WITH MIN/... | Sergey Glukhov | 2011-04-12 | 1 | -0/+11 |
| * | | | | | | auto-merge 5.1-->5.5 (bug 11766094) | Gleb Shchepa | 2011-04-02 | 1 | -0/+9 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Bug #11766094 - 59132: MIN() AND MAX() REMOVE UNSIGNEDNESS | Gleb Shchepa | 2011-03-31 | 1 | -0/+9 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | Backport of fix for Bug#52123 | Tor Didriksen | 2011-02-02 | 1 | -0/+10 |
| * | | | | | 5.1-bugteam->5.5-bugteam merge | Sergey Glukhov | 2010-12-21 | 1 | -0/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | test case fix | Sergey Glukhov | 2010-12-21 | 1 | -0/+1 |
| * | | | | | 5.1-bugteam->5.5-bugteam merge | Sergey Glukhov | 2010-12-21 | 1 | -0/+12 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Bug#58030 crash in Item_func_geometry_from_text::val_str | Sergey Glukhov | 2010-12-21 | 1 | -0/+12 |
| | | |_|/ | | |/| | | |||||
| * | | | | Fix for Bug#57932 "query with avg returns incorrect results": | Guilhem Bichot | 2010-12-07 | 1 | -0/+15 |
* | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | |||||
| * | | | 5.2 merge | Sergei Golubchik | 2010-10-28 | 1 | -0/+11 |
| |\ \ \ | | |/ / | | | / | | |/ | |/| | |||||
| * | | Merge MariaDB-5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-03-20 | 1 | -1/+238 |
| |\ \ | |||||
| * | | | Backport into MariaDB-5.2 the following: | Sergey Petrunya | 2009-12-15 | 1 | -1/+1 |
* | | | | Auto-merge from mysql-5.5. | Alexander Nozdrin | 2010-08-30 | 1 | -1/+11 |
|\ \ \ \ | |||||
| * | | | | Bug#56120: Failed assertion on MIX/MAX on negative time value | Evgeny Potemkin | 2010-08-23 | 1 | -1/+11 |
* | | | | | Automerge. | Alexey Kopytov | 2010-08-30 | 1 | -0/+11 |
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||||
| * | | | Bug #54465: assert: field_types == 0 || field_types[field_pos] | Alexey Kopytov | 2010-08-27 | 1 | -0/+11 |
| | |/ | |/| |