Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -66/+59 |
* | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -27/+28 |
* | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -21/+44 |
|\ | |||||
| * | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -16/+34 |
| |\ | |||||
| | * | Merge 5.3->5.5 | Igor Babaev | 2013-01-23 | 1 | -5/+9 |
| | |\ | |||||
| | | * | Merge 5.2->5.3 | Igor Babaev | 2013-01-21 | 1 | -5/+9 |
| | | |\ | |||||
| | | | * | Fixed bug mdev-3938. | Igor Babaev | 2013-01-15 | 1 | -4/+8 |
| | * | | | 5.3 merge | Sergei Golubchik | 2013-01-15 | 1 | -11/+25 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | MDEV-3914 fix. | unknown | 2012-12-05 | 1 | -11/+25 |
| * | | | | cleanup: | Sergei Golubchik | 2013-01-23 | 1 | -3/+1 |
| * | | | | cleanup: use MYF() for mysys flags | Sergei Golubchik | 2013-01-23 | 1 | -3/+3 |
| * | | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -4/+11 |
* | | | | | Merge 10.0-base -> 10.0. | Igor Babaev | 2013-01-10 | 1 | -1/+32 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge 5.5-mwl248 -> 10.0-base | Igor Babaev | 2013-01-08 | 1 | -0/+10 |
| |\ \ \ \ | |||||
| | * | | | | Fixed bug mdev-3979. | Igor Babaev | 2013-01-08 | 1 | -0/+10 |
| * | | | | | Merge mwl248->10.0-base. | Igor Babaev | 2012-12-19 | 1 | -1/+22 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge maria-5.5-mwl248 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -1/+21 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Addressed all remaining issues from the review of the patch | Igor Babaev | 2012-12-13 | 1 | -1/+1 |
| | | * | | | | Changed the names of the system tables for statistical data: | Igor Babaev | 2012-12-05 | 1 | -4/+5 |
| | | * | | | | Merge 5.5->mwl248 | Igor Babaev | 2012-12-04 | 1 | -11/+15 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | * | | | | Merge 5.5 -> 5.5-mwl248. | Igor Babaev | 2012-11-02 | 1 | -1/+20 |
| | | |\ \ \ \ | |||||
| | | | * \ \ \ | Merge 5.5 -> mwl248 | Igor Babaev | 2012-09-08 | 1 | -0/+22 |
| | | | |\ \ \ \ | |||||
| | | | * \ \ \ \ | Merge 5.5->5.5-mwl248. | Igor Babaev | 2012-08-29 | 1 | -1/+1 |
| | | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merge 5.5 -> 5.5-mwl248. | Igor Babaev | 2012-07-30 | 1 | -1/+8 |
| | | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | | Performed re-factoring and re-structuring of the code for mwl#248: | Igor Babaev | 2012-07-26 | 1 | -19/+11 |
| | | | * | | | | | | | Merge 5.5 -> 5.5-mwl248. | Igor Babaev | 2012-06-26 | 1 | -7/+21 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | Changed the type of all double columns in the system statistical tables | Igor Babaev | 2012-06-25 | 1 | -11/+11 |
| | | | * | | | | | | | | Merge. | Igor Babaev | 2012-05-18 | 1 | -1/+2 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | Fixed a problem for Q18 from DBT3/SF30 with innodb database instance: | Igor Babaev | 2012-04-19 | 1 | -0/+1 |
| | | | * | | | | | | | | | Merge 5.5 -> 5.5-mwl248. | Igor Babaev | 2012-04-11 | 1 | -25/+46 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | The pilot implementation of mwl#250: Use the statistics from persistent | Igor Babaev | 2012-04-11 | 1 | -2/+8 |
| | | | * | | | | | | | | | | Merge maria-5.3-mwl248 -> 5.5 = maria-5.5-mwl248. | Igor Babaev | 2012-03-19 | 1 | -1/+21 |
| | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ | Merge | Igor Babaev | 2012-03-15 | 1 | -2/+2 |
| | | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ \ | Merged 5.3 changes into the mwl #248 tree. | Igor Babaev | 2012-03-09 | 1 | -1/+61 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | | | | The main patch for the MWL#248 back-ported from | Igor Babaev | 2012-01-04 | 1 | -1/+19 |
* | | | | | | | | | | | | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 1 | -35/+140 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | remove HAVE_EXPLICIT_TEMPLATE_INSTANTIATION | Sergei Golubchik | 2012-12-17 | 1 | -9/+0 |
| |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -11/+27 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2012-11-22 | 1 | -9/+12 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | Merge MariaDB 5.2->5.3 | unknown | 2012-11-20 | 1 | -9/+12 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | Fixed bug mdev-3845. | Igor Babaev | 2012-11-09 | 1 | -9/+12 |
| | * | | | | | | | | | | | | | | Fixed bug mdev-3851. | Igor Babaev | 2012-11-11 | 1 | -2/+3 |
| | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-12-13 | 1 | -8/+4 |
| * | | | | | | | | | | | | | | Merge mdev-452 with the latest 10.0-base. | unknown | 2012-10-18 | 1 | -12/+126 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-10-17 | 1 | -12/+117 |
| |/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | merge with 5.5 | Sergei Golubchik | 2012-11-03 | 1 | -0/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | 5.3 merge | Sergei Golubchik | 2012-10-18 | 1 | -0/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| / / / / / / / / / / / | | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | Fix of MDEV-3799. | unknown | 2012-10-10 | 1 | -0/+9 |
| | * | | | | | | | | | | | MDEV-495 backport --ignore-db-dir. | Alexey Botchkov | 2012-09-27 | 1 | -0/+3 |
* | | | | | | | | | | | | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 1 | -2/+31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |