Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -29/+18 |
* | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -1/+5 |
* | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -0/+3 |
|\ | |||||
| * | Merge 5.3->5.5 | Igor Babaev | 2013-01-23 | 1 | -0/+3 |
| |\ | |||||
* | \ | Merged the fix for bug mdev-4019. | Igor Babaev | 2013-01-13 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | Fixed bug mdev-4019. | Igor Babaev | 2013-01-13 | 1 | -0/+1 |
* | | | | Merge 5.5-mwl248 -> 10.0-base | Igor Babaev | 2013-01-08 | 1 | -8/+16 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixed bug mdev-3979. | Igor Babaev | 2013-01-08 | 1 | -8/+16 |
* | | | | Merge maria-5.5-mwl248 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -0/+20 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 5.5->mwl248 | Igor Babaev | 2012-12-04 | 1 | -0/+7 |
| |\ \ \ | | |/ / | |||||
| * | | | Merge 5.5 -> 5.5-mwl248. | Igor Babaev | 2012-11-02 | 1 | -0/+20 |
| |\ \ \ | |||||
| | * \ \ | Merge 5.5 -> mwl248 | Igor Babaev | 2012-09-08 | 1 | -0/+1 |
| | |\ \ \ | |||||
| | * | | | | Performed re-factoring and re-structuring of the code for mwl#248: | Igor Babaev | 2012-07-26 | 1 | -14/+11 |
| | * | | | | Merge 5.5 -> 5.5-mwl248. | Igor Babaev | 2012-06-26 | 1 | -0/+2 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge. | Igor Babaev | 2012-05-18 | 1 | -7/+10 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge 5.5 -> 5.5-mwl248. | Igor Babaev | 2012-04-11 | 1 | -0/+9 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | The pilot implementation of mwl#250: Use the statistics from persistent | Igor Babaev | 2012-04-11 | 1 | -0/+4 |
| | * | | | | | | | Merge maria-5.3-mwl248 -> 5.5 = maria-5.5-mwl248. | Igor Babaev | 2012-03-19 | 1 | -0/+19 |
| | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge | Igor Babaev | 2012-03-15 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merged 5.3 changes into the mwl #248 tree. | Igor Babaev | 2012-03-09 | 1 | -3/+36 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | The main patch for the MWL#248 back-ported from | Igor Babaev | 2012-01-04 | 1 | -0/+19 |
* | | | | | | | | | | | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2012-11-22 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | / | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||||
| | * | | | | | | | | | Merge MariaDB 5.2->5.3 | unknown | 2012-11-20 | 1 | -0/+7 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Fixed bug mdev-3845. | Igor Babaev | 2012-11-09 | 1 | -0/+7 |
| | | * | | | | | | | | | merge | Sergei Golubchik | 2012-04-05 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ | mysql-5.1.62 merge | Sergei Golubchik | 2012-04-05 | 1 | -0/+1 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | Bug#13580775 ASSERTION FAILED: RECORD_LENGTH == M_RECORD_LENGTH | Tor Didriksen | 2012-01-27 | 1 | -0/+1 |
| * | | | | | | | | | | | | | 5.3 merge | Sergei Golubchik | 2012-10-18 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | Fix of MDEV-589. | unknown | 2012-10-05 | 1 | -0/+1 |
* | | | | | | | | | | | | | | Merge mdev-452 with the latest 10.0-base. | unknown | 2012-10-18 | 1 | -35/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-10-17 | 1 | -35/+6 |
* | | | | | | | | | | | | | | | SHOW EXPLAIN: merge to 10.0-base. | Sergey Petrunya | 2012-10-06 | 1 | -1/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | SHOW EXPLAIN: merge with 5.5-main | Sergey Petrunya | 2012-10-06 | 1 | -1/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Merge 5.5-main -> 5.5-show-explain | Sergey Petrunya | 2012-07-25 | 1 | -0/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Merge of recent changes in MWL#182 in 5.3 with {Merge of MWL#182 with 5.5} | Sergey Petrunya | 2012-05-17 | 1 | -1/+6 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | MDEV-238: SHOW EXPLAIN: Server crashes in JOIN::print_explain with FROM subqu... | Sergey Petrunya | 2012-05-10 | 1 | -1/+6 |
* | | | | | | | | | | | | | | | Automatic merge | Michael Widenius | 2012-09-22 | 1 | -3/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | This fix+comments was originally made by Alexey Kopytov | Michael Widenius | 2012-09-18 | 1 | -3/+8 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | merge 5.3->5.5 | unknown | 2012-09-06 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | / / / / / / / / / | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | MDEV-486 LP BUG#1010116 fix. | unknown | 2012-09-05 | 1 | -0/+1 |
* | | | | | | | | | | | | | MDEV-415: Back-port of the WL task #1393 from the mysql-5.6 code line. | Igor Babaev | 2012-09-01 | 1 | -5/+40 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Fixed LP bug #1010729. | Igor Babaev | 2012-06-08 | 1 | -0/+2 |
| |/ / / / / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | 5.3 merge | Sergei Golubchik | 2012-05-04 | 1 | -7/+10 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | / | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
| * | | | | | | | | | LPBUG#983285 - incompatibility in frm in case of VIEWs with non-default ALGOR... | Vladislav Vaintroub | 2012-04-20 | 1 | -7/+10 |
| |/ / / / / / / / | |||||
* | | | | | | | | | merge | Sergei Golubchik | 2012-04-07 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Fix of LP bug#968720. | unknown | 2012-04-05 | 1 | -0/+6 |
| * | | | | | | | | BUG#913030: Optimizer chooses a suboptimal excution plan for Q18 from DBT-3 | Sergey Petrunya | 2012-04-02 | 1 | -0/+2 |
* | | | | | | | | | Merge mariadb 5.3->mariadb 5.5 | unknown | 2012-03-24 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | / / / / | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Improve filesort performance for small sorts: Don't write pointers to records... | unknown | 2012-03-24 | 1 | -0/+1 |
| | |_|_|_|_|/ | |/| | | | | |