Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | remove ULL() and LL(), because they're totally unnecessary | Sergei Golubchik | 2013-04-07 | 1 | -9/+9 |
* | 5.5 merge | Sergei Golubchik | 2013-03-27 | 1 | -5/+19 |
|\ | |||||
| * | merge with mysql-5.5.30 minus few incorrect or not applicable changesets | Sergei Golubchik | 2013-02-28 | 1 | -4/+4 |
| |\ | |||||
| | * | Merge from 5.1 | Chaithra Gopalareddy | 2012-12-24 | 1 | -4/+4 |
| | |\ | |||||
| | | * | Bug#11757005: UNION CONVERTS UNSIGNED MEDIUMINT AND BIGINT | Chaithra Gopalareddy | 2012-12-24 | 1 | -4/+4 |
| * | | | MDEV-3819 missing constraints for spatial column types. | Alexey Botchkov | 2013-02-21 | 1 | -1/+15 |
* | | | | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -0/+15 |
|\ \ \ \ | |/ / / | |||||
| * | | | 5.3 merge | Sergei Golubchik | 2013-01-28 | 1 | -0/+15 |
| |\ \ \ | |||||
| | * | | | MDEV-3875 Wrong result (missing row) on a DISTINCT query with the same subque... | Sergei Golubchik | 2013-01-26 | 1 | -0/+15 |
* | | | | | Merge mwl248->10.0-base. | Igor Babaev | 2012-12-19 | 1 | -60/+98 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge maria-5.5-mwl248 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -60/+98 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fixed bug mdev-3866. | Igor Babaev | 2012-11-19 | 1 | -1/+3 |
| | * | | | | | Merge 5.5 -> 5.5-mwl248. | Igor Babaev | 2012-11-02 | 1 | -59/+95 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | | * | | | | Merge 5.5 -> mwl248 | Igor Babaev | 2012-09-08 | 1 | -1/+1 |
| | | |\ \ \ \ | |||||
| | | * | | | | | Part 2 of the fix for bug mdev-504. | Igor Babaev | 2012-09-08 | 1 | -4/+3 |
| | | * | | | | | Merge 5.5->5.5-mwl248 | Igor Babaev | 2012-08-14 | 1 | -0/+11 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | Performed re-factoring and re-structuring of the code for mwl#248: | Igor Babaev | 2012-07-26 | 1 | -58/+79 |
| | | * | | | | | | Merge 5.5 -> 5.5-mwl248. | Igor Babaev | 2012-06-26 | 1 | -2/+2 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge | Igor Babaev | 2012-06-01 | 1 | -1/+13 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge 5.5 -> 5.5-mwl248. | Igor Babaev | 2012-04-11 | 1 | -2/+1 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | Merge maria-5.3-mwl248 -> 5.5 = maria-5.5-mwl248. | Igor Babaev | 2012-03-19 | 1 | -2/+18 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ | Merge | Igor Babaev | 2012-03-15 | 1 | -13/+61 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | The main patch for the MWL#248 back-ported from | Igor Babaev | 2012-01-04 | 1 | -2/+18 |
* | | | | | | | | | | | | | | remove HAVE_EXPLICIT_TEMPLATE_INSTANTIATION | Sergei Golubchik | 2012-12-17 | 1 | -5/+0 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-12-13 | 1 | -26/+25 |
* | | | | | | | | | | | | | Merge mdev-452 with the latest 10.0-base. | unknown | 2012-10-18 | 1 | -83/+108 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-10-17 | 1 | -83/+74 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Added new status variables: | Michael Widenius | 2012-09-09 | 1 | -0/+3 |
| |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | 5.3 merge | Sergei Golubchik | 2012-08-31 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | / / / | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
| * | | | | | | | | | MDEV-454 Addition of a time interval reduces the resulting value | Sergei Golubchik | 2012-08-29 | 1 | -1/+1 |
| * | | | | | | | | | 5.2 merge. | Sergei Golubchik | 2012-08-22 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | 5.1 merge | Sergei Golubchik | 2012-08-22 | 1 | -0/+11 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | merge with MySQL 5.1.65 | Sergei Golubchik | 2012-08-22 | 1 | -0/+11 |
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ | | | | |/| | | | | | | |||||
* | | | | | | | | | | | merge with MySQL 5.5.27 | Sergei Golubchik | 2012-08-09 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| * | | | | | | | | | auto-merge | Gleb Shchepa | 2012-06-29 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | minor update to make MSVS happy | Gleb Shchepa | 2012-06-29 | 1 | -1/+1 |
| * | | | | | | | | | manual merge (WL6219) | Gleb Shchepa | 2012-06-29 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | Backport of the deprecation warning from WL#6219: "Deprecate and remove YEAR(... | Gleb Shchepa | 2012-06-29 | 1 | -0/+11 |
* | | | | | | | | | | mysql-5.5 merge | Sergei Golubchik | 2012-06-14 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Merge 5.5.24 back into main 5.5. | Joerg Bruehe | 2012-05-07 | 1 | -2/+14 |
| |\ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ | c | Sergei Golubchik | 2012-05-21 | 1 | -1/+13 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Bug#13871079 RQG_MYISAM_DML_ALTER_VALGRIND FAILS ON VALGRIND PN PB2 | Tor Didriksen | 2012-04-12 | 1 | -1/+13 |
| |/ / / / / / / | |||||
* | | | | | | | | mysql 5.5.23 merge | Sergei Golubchik | 2012-04-10 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | / / | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Bug#13832953 MY_STRNXFRM_UNICODE: ASSERTION `SRC' FAILED. | MY_STRNXFRM_UNIC... | Alexander Barkov | 2012-03-20 | 1 | -2/+1 |
* | | | | | | | Merge 5.3->5.5 | Igor Babaev | 2012-03-17 | 1 | -14/+60 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Fixed bug lp:917689 "Archive table corruption crashing MariaDB signal 11" | Michael Widenius | 2012-03-13 | 1 | -13/+61 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | mysql-5.5 merge | Sergei Golubchik | 2012-01-16 | 1 | -1/+2 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Backport from trunk of: | Tor Didriksen | 2011-08-19 | 1 | -1/+2 |
* | | | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+1 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -11/+13 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | |