Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -12/+457 |
|\ | |||||
| * | Fixed LP bug #823189. | Igor Babaev | 2011-08-11 | 1 | -4/+50 |
| * | Merge. | Igor Babaev | 2011-07-21 | 1 | -31/+0 |
| |\ | |||||
| | * | Made the optimizer switches 'derived_merge' and 'derived_with_keys' | Igor Babaev | 2011-07-21 | 1 | -31/+0 |
| * | | Fix for LP BUG#806071 | unknown | 2011-07-21 | 1 | -3/+28 |
| * | | Merge from 5.2 | unknown | 2011-07-21 | 1 | -1/+18 |
| |\ \ | | |/ | |/| | |||||
| | * | Removed incorrect fix and its test suite (the test suit is duplicate). | unknown | 2011-07-21 | 1 | -1/+1 |
| | * | Fix of LP BUG#777809 | unknown | 2011-07-21 | 1 | -0/+17 |
| * | | Fixed LP bug #793386. | Igor Babaev | 2011-07-11 | 1 | -0/+18 |
| * | | Set the default to be mrr=off,mrr_sort_keys=off: | Sergey Petrunya | 2011-07-08 | 1 | -2/+2 |
| * | | Fixed LP bug #804686. | Igor Babaev | 2011-07-03 | 1 | -0/+31 |
| * | | Fix buildbot failures: | Sergey Petrunya | 2011-06-30 | 1 | -1/+1 |
| * | | Added test cases for LP bug #798625 and LP bug #800085 | Igor Babaev | 2011-06-24 | 1 | -0/+17 |
| * | | Fixed LP bug #798576. | Igor Babaev | 2011-06-24 | 1 | -0/+22 |
| * | | Fixed LP bug #798621. | Igor Babaev | 2011-06-21 | 1 | -0/+23 |
| * | | Fixed LP bug #794038. | Igor Babaev | 2011-06-09 | 1 | -0/+16 |
| * | | Return commented out tests. | Oleksandr Byelkin | 2011-05-31 | 1 | -0/+22 |
| * | | Merge | Igor Babaev | 2011-05-20 | 1 | -26/+4 |
| |\ \ | |||||
| | * | | Fixed LP bug #784281. | Igor Babaev | 2011-05-17 | 1 | -0/+6 |
| | * | | Merged the code of MWL#106 into 5.3 | Igor Babaev | 2011-05-16 | 1 | -32/+4 |
| | |\ \ | |||||
| | | * \ | Merge of the mwl106 tree into the latest 5.3 tree. | Igor Babaev | 2010-09-23 | 1 | -3/+3 |
| | | |\ \ | |||||
| | | | * | | MWL#106: Backport optimizations for derived tables and views. | Igor Babaev | 2010-05-26 | 1 | -3/+3 |
| * | | | | | Merged the fix for bug 777745 into 5.3. | Igor Babaev | 2011-05-19 | 1 | -0/+30 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fixed LP bug #777745. | Igor Babaev | 2011-05-19 | 1 | -0/+30 |
| | |/ / / / | |||||
| * | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -0/+9 |
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| | | |||||
| | * | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -0/+9 |
| | |\ \ \ | |||||
| * | \ \ \ | Merge | Igor Babaev | 2011-04-26 | 1 | -0/+155 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fixed LP bugs #717577, #724942. | Igor Babaev | 2011-04-26 | 1 | -0/+155 |
| * | | | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -0/+15 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / / | |||||
| | * | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -0/+15 |
| | |\ \ \ \ | |||||
| * | \ \ \ \ | Merge | Igor Babaev | 2011-02-07 | 1 | -0/+20 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fixed LP bug #702403 that caused a crash on the tree for mwl#128 | Igor Babaev | 2011-02-05 | 1 | -0/+20 |
| * | | | | | | | Back-ported the patch for bug #59696 from mysql-5.6 code line. | Igor Babaev | 2011-01-31 | 1 | -0/+54 |
| |/ / / / / / | |||||
| * | | | | | | Merge 5.3-mwl128 -> 5.3 | Igor Babaev | 2010-10-27 | 1 | -3/+3 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | MWL#128: Added into EXPLAIN output info about types of the used join buffers and | Igor Babaev | 2010-10-18 | 1 | -1/+1 |
| | * | | | | | | Fixed bug #52636. | Igor Babaev | 2010-09-28 | 1 | -2/+2 |
| | | |_|_|/ / | | |/| | | | | |||||
* | | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -0/+24 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | manual merge 5.1-->5.5 (bug 11829681) | Gleb Shchepa | 2011-04-08 | 1 | -0/+9 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| | * | | | | | | Bug #11829681 - 60295: ERROR 1356 ON VIEW THAT EXECUTES FINE AS A QUERY | Gleb Shchepa | 2011-04-08 | 1 | -0/+9 |
| | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | 5.1-bugteam->5.5-bugteam merge | Sergey Glukhov | 2010-12-14 | 1 | -0/+13 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Fixed following problems: | Sergey Glukhov | 2010-12-14 | 1 | -0/+13 |
| | * | | | | | Bug#35333, "If Federated table can't connect to remote host, can't retrieve | Christopher Powers | 2010-11-29 | 1 | -0/+2 |
| * | | | | | | Bug#35333, "If Federated table can't connect to remote host, can't retrieve | Christopher Powers | 2010-11-30 | 1 | -0/+2 |
* | | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -20/+20 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 1 | -2/+2 |
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| | | |||||
| | * | | | Fixed bug #49600. | Igor Babaev | 2010-09-11 | 1 | -2/+2 |
| * | | | | MariaDB 5.2 -> MariaDB 5.3 merge | Sergey Petrunya | 2010-06-26 | 1 | -2/+40 |
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | | |||||
| | * | | Merge with MySQL 5.1.47 | Michael Widenius | 2010-05-26 | 1 | -0/+8 |
| | |\ \ | | | |/ | |||||
| | * | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -2/+32 |
| | |\ \ | |||||
| * | \ \ | Merge MariaDB-5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-03-20 | 1 | -7/+7 |
| |\ \ \ \ | | |/ / / |