Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed. | Igor Babaev | 2011-06-04 | 4 | -12/+10 |
|\ | |||||
| * | Merge | Igor Babaev | 2011-05-20 | 4 | -12/+10 |
| |\ | |||||
| | * | Merged the code of MWL#106 into 5.3 | Igor Babaev | 2011-05-16 | 4 | -12/+10 |
| | |\ | |||||
| | | * | Post-merge fix: adjusted results for the vcol suite. | Igor Babaev | 2010-09-23 | 4 | -12/+10 |
* | | | | Merge 5.3->main -> 5.3-mwl90 | Sergey Petrunya | 2011-05-29 | 3 | -0/+12 |
|\ \ \ \ | |||||
| * \ \ \ | Merge MWL#90 into 5.3-main | Sergey Petrunya | 2011-04-30 | 3 | -0/+12 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Merge MWL#90 with main 5.3 tree | Sergey Petrunya | 2011-04-02 | 3 | -0/+12 |
| | |\ \ \ | |||||
| | | * \ \ | Merge 5.3 -> 5.3-subqueries-mwl90 | Sergey Petrunya | 2011-03-01 | 22 | -39/+33 |
| | | |\ \ \ | |||||
| | | * | | | | Post-merge test result update. | Sergey Petrunya | 2011-02-17 | 2 | -4/+4 |
| | | * | | | | MWL#90: Subqueries: Inside-out execution for materialized non-sj subqueries | Sergey Petrunya | 2011-02-15 | 3 | -4/+16 |
| | | |\ \ \ \ | |||||
| | | | * \ \ \ | MWL#90: Subqueries: Inside-out execution for materialized non-sj subqueries | Sergey Petrunya | 2010-12-09 | 3 | -4/+16 |
| | | | |\ \ \ \ | |||||
| | | | | * | | | | Post-merge .result fixes | Sergey Petrunya | 2010-07-12 | 3 | -4/+16 |
| | | | | | |_|/ | | | | | |/| | | |||||
* | | | | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 4 | -2/+75 |
* | | | | | | | | Changed MariaDB error numbers to start from 1900 to not conflict with MySQL e... | Michael Widenius | 2011-05-21 | 3 | -22/+22 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge with dynamic column code | Michael Widenius | 2011-05-12 | 2 | -0/+20 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Adding support for Dynamic columns (WL#34): | Michael Widenius | 2011-05-08 | 2 | -0/+20 |
| |/ / / / / / | |||||
* | | | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Amend the previous cset: | Sergey Petrunya | 2011-04-04 | 3 | -12/+12 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 2 | -6/+4 |
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | |||||
| * | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 2 | -6/+4 |
* | | | | | Merge with 5.1 | Michael Widenius | 2011-01-11 | 22 | -39/+33 |
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | | |||||
| * | | | virtual columns: | Sergei Golubchik | 2010-12-31 | 22 | -39/+33 |
* | | | | Remove .moved files | Sergey Petrunya | 2010-11-15 | 1 | -24/+0 |
* | | | | Merge MWL#121-125 DS-MRR improvements into MWL#128 Classic hash join tree | Sergey Petrunya | 2010-11-15 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * \ \ \ | Merge MWL#121-124 DS-MRR support for key-ordered reads + MWL#128 BNL-Hash join | Sergey Petrunya | 2010-11-01 | 1 | -1/+2 |
| |\ \ \ \ | |||||
| | * \ \ \ | MWL#121-124 DS-MRR support for key-ordered retrieval, etc | Sergey Petrunya | 2010-11-01 | 2 | -2/+3 |
| | |\ \ \ \ | |||||
| | | * | | | | - Remove out-of-date comments | Sergey Petrunya | 2010-08-14 | 2 | -2/+3 |
| | | | |_|/ | | | |/| | | |||||
* | | | | | | Merge | Igor Babaev | 2010-11-02 | 4 | -24/+4 |
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | |||||
| * | | | | Merge 5.3-mwl128 -> 5.3 | Igor Babaev | 2010-10-27 | 4 | -24/+4 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | MWL#128: Added into EXPLAIN output info about types of the used join buffers and | Igor Babaev | 2010-10-18 | 3 | -3/+3 |
| | * | | | Adjusted some results from the vcol, pbxt, maria test suites after | Igor Babaev | 2010-10-02 | 1 | -1/+1 |
| | |/ / | |||||
* | | | | merge w/ 5.2 | Sergei Golubchik | 2010-11-02 | 3 | -5/+5 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | fix LIKE in a vcol function, broken by a fix for mysql bug#54568. | Sergei Golubchik | 2010-10-30 | 3 | -5/+5 |
* | | | Merge MariaDB 5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-10-14 | 1 | -19/+0 |
* | | | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 19 | -205/+668 |
|\ \ \ | |/ / | | / | |/ |/| | |||||
| * | restore shifted error numbers | Sergei Golubchik | 2010-09-12 | 3 | -22/+22 |
| * | Fixed compiler warnings and test failures | Michael Widenius | 2010-08-06 | 1 | -0/+2 |
| * | Check of maria engine presence added. | unknown | 2010-08-04 | 1 | -1/+3 |
| * | Fix for launchpad bug #612894 | unknown | 2010-08-03 | 2 | -0/+126 |
| * | Fixed bug #610890. | Igor Babaev | 2010-07-28 | 2 | -0/+18 |
| * | Merge | Igor Babaev | 2010-07-26 | 2 | -0/+36 |
| |\ | |||||
| | * | Fixed bug #607177. | Igor Babaev | 2010-07-20 | 2 | -0/+36 |
| * | | Merge | Igor Babaev | 2010-07-21 | 2 | -0/+18 |
| |\ \ | |||||
| | * | | Fixed bug #607168. | Igor Babaev | 2010-07-20 | 2 | -0/+18 |
| | |/ | |||||
| * | | Fixed bug #607566. | Igor Babaev | 2010-07-19 | 2 | -0/+25 |
| |/ | |||||
| * | Merge | Igor Babaev | 2010-07-17 | 2 | -1/+51 |
| |\ | |||||
| | * | Fixed bug #604503. | Igor Babaev | 2010-07-17 | 2 | -0/+47 |
| * | | Fixed bug #603186. | Igor Babaev | 2010-07-15 | 2 | -0/+34 |
| |/ | |||||
| * | Fixed bug #603654. | Igor Babaev | 2010-07-13 | 2 | -0/+22 |
| * | Fixed bug #604549. | Igor Babaev | 2010-07-13 | 15 | -204/+223 |