Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -4/+44 |
* | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -15/+36 |
* | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -0/+1 |
|\ | |||||
| * | 5.3 merge | Sergei Golubchik | 2013-01-28 | 1 | -0/+1 |
| |\ | |||||
| | * | MDEV-3875 Wrong result (missing row) on a DISTINCT query with the same subque... | Sergei Golubchik | 2013-01-26 | 1 | -0/+1 |
* | | | Merge maria-5.5-mwl248 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -0/+99 |
|\ \ \ | |||||
| * | | | Part 2 of the fix for bug mdev-504. | Igor Babaev | 2012-09-08 | 1 | -3/+2 |
| * | | | Performed re-factoring and re-structuring of the code for mwl#248: | Igor Babaev | 2012-07-26 | 1 | -75/+8 |
| * | | | Merge 5.5 -> 5.5-mwl248. | Igor Babaev | 2012-06-26 | 1 | -2/+10 |
| |\ \ \ | | |/ / | |||||
| * | | | Changed the type of all double columns in the system statistical tables | Igor Babaev | 2012-06-25 | 1 | -7/+42 |
| * | | | Merge | Igor Babaev | 2012-06-01 | 1 | -1/+7 |
| |\ \ \ | |||||
| * \ \ \ | Merge maria-5.3-mwl248 -> 5.5 = maria-5.5-mwl248. | Igor Babaev | 2012-03-19 | 1 | -0/+131 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge | Igor Babaev | 2012-03-15 | 1 | -39/+51 |
| | |\ \ \ \ | |||||
| | * | | | | | Fixed a compiler warning. | Igor Babaev | 2012-01-05 | 1 | -1/+1 |
| | * | | | | | The main patch for the MWL#248 back-ported from | Igor Babaev | 2012-01-04 | 1 | -0/+131 |
* | | | | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-12-13 | 1 | -0/+9 |
* | | | | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-10-17 | 1 | -3/+69 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | fix compile error, when building with oqgraph | Vladislav Vaintroub | 2012-06-25 | 1 | -0/+3 |
* | | | | | | Merge 5.3->5.5. | Igor Babaev | 2012-06-24 | 1 | -0/+4 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Merge 5.2->5.3 | Igor Babaev | 2012-06-23 | 1 | -0/+4 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | Fixed bug mdev-354. | Igor Babaev | 2012-06-18 | 1 | -0/+4 |
* | | | | | | 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/+8 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | c | Sergei Golubchik | 2012-05-21 | 1 | -1/+7 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | / / | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Bug#13871079 RQG_MYISAM_DML_ALTER_VALGRIND FAILS ON VALGRIND PN PB2 | Tor Didriksen | 2012-04-12 | 1 | -1/+7 |
| |/ / / / | |||||
| * | | | | Merge BUG#12997905 from 5.1 to 5.5 | Jorgen Loland | 2011-11-18 | 1 | -0/+17 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge 5.3->5.5 | Igor Babaev | 2012-03-17 | 1 | -53/+51 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Fixed bug lp:917689 "Archive table corruption crashing MariaDB signal 11" | Michael Widenius | 2012-03-13 | 1 | -39/+51 |
| | |_|_|/ | |/| | | | |||||
* | | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+18 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -3/+21 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+21 |
| | |\ \ \ | |||||
| | | * \ \ | Merge with MySQL 5.1.60 | Michael Widenius | 2011-11-23 | 1 | -0/+17 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | | * | | Backmerge of BUG#12997905 | Jorgen Loland | 2011-11-18 | 1 | -0/+17 |
| | | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+4 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -1/+3 |
| | | | |\ \ | |||||
* | | | | \ \ | merge | Sergei Golubchik | 2011-11-03 | 1 | -9/+9 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | compilation warnings on Windows | Sergei Golubchik | 2011-11-02 | 1 | -9/+9 |
* | | | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+8 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Bug#11908153: CRASH AND/OR VALGRIND ERRORS IN FIELD_BLOB::GET_KEY_IMAGE | Tor Didriksen | 2011-07-04 | 1 | -1/+7 |
| * | | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| | | * | | | | | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-06-09 | 1 | -1/+1 |
* | | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -389/+340 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | Merge of mwl #106 into 5.3. | Igor Babaev | 2011-06-15 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed. | Igor Babaev | 2011-06-04 | 1 | -0/+3 |
| | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge | Igor Babaev | 2011-05-20 | 1 | -0/+3 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | Merged the code of MWL#106 into 5.3 | Igor Babaev | 2011-05-16 | 1 | -0/+3 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ | Merge of the mwl106 tree into the latest 5.3 tree. | Igor Babaev | 2010-09-23 | 1 | -0/+3 |
| | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | * | | | | | | | MWL#106: Backport optimizations for derived tables and views. | Igor Babaev | 2010-05-26 | 1 | -0/+3 |