Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-05-13 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
| |\ | |||||
| | * | Update FSF Address | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
* | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-11-06 | 1 | -5/+5 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2018-10-30 | 1 | -4/+4 |
| |\ \ | |||||
| | * | | MDEV-17358 my_reverse_bits() is incorrect due to UB | Eugene Kosov | 2018-10-16 | 1 | -4/+4 |
| | |/ | |||||
* | | | Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocks | Sergei Petrunia | 2017-03-11 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | Fix many -Wconversion warnings. | Marko Mäkelä | 2017-03-07 | 1 | -2/+2 |
| |/ / | |||||
* | | | MDEV-11901 : MariaRocks on Windows | Vladislav Vaintroub | 2017-02-01 | 1 | -25/+19 |
|/ / | |||||
* | | cleanup | Sergei Golubchik | 2016-02-23 | 1 | -0/+9 |
|/ | |||||
* | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -1/+2 |
|\ | |||||
| * | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -3/+22 |
| |\ | |||||
| * | | After merge fixes. | unknown | 2008-04-29 | 1 | -2/+2 |
| * | | Windows fixes | unknown | 2008-01-10 | 1 | -0/+2 |
| * | | push for trnman review | unknown | 2006-10-13 | 1 | -2/+2 |
| * | | amd64 atomic ops | unknown | 2006-08-10 | 1 | -0/+107 |
| / | |||||
* | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -2/+20 |
|\ \ | |||||
| * \ | Merge from mysql-5.1 to mysql-5.5 | Jon Olav Hauglid | 2011-02-16 | 1 | -2/+20 |
| |\ \ | | |/ | |||||
| | * | Bug #11752069 (former bug 43152) | Jon Olav Hauglid | 2011-02-16 | 1 | -3/+21 |
* | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -0/+2 |
|/ / | |||||
* | | WL#5498: Remove dead and unused source code | Davi Arnaut | 2010-07-23 | 1 | -15/+6 |
* | | WL#5016: Fix header file include guards | Mats Kindahl | 2009-09-23 | 1 | -0/+5 |
|/ | |||||
* | Fixes to merge between 5.1-main and 5.1-marvel | unknown | 2007-10-15 | 1 | -2/+4 |
* | Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1 | unknown | 2007-10-11 | 1 | -0/+107 |