Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-05-14 | 1 | -1/+1 |
|\ | |||||
| * | 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 bb-10.2-ext into 10.3 | Marko Mäkelä | 2018-02-15 | 1 | -11/+13 |
|\ \ \ \ | |/ / / | |||||
| * | | | compilation error on windows | Sergei Golubchik | 2018-02-06 | 1 | -1/+1 |
| * | | | Merge branch 'github/10.1' into 10.2 | Sergei Golubchik | 2018-02-06 | 1 | -11/+13 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'github/10.0' into 10.1 | Sergei Golubchik | 2018-02-02 | 1 | -11/+13 |
| | |\ \ | | | |/ | |||||
| | | * | BIT field woes | Sergei Golubchik | 2018-01-16 | 1 | -11/+13 |
* | | | | MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from ... | Vladislav Vaintroub | 2018-02-06 | 1 | -3/+3 |
|/ / / | |||||
* | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-12-29 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | MDEV-10759 Fix Aria to support 2-byte collation IDs | Monty | 2016-12-02 | 1 | -1/+1 |
| |/ | |||||
* | | MDEV-8360 Clean-up CHARSET_INFO: strnncollsp: diff_if_only_endspace_difference | Alexander Barkov | 2016-03-31 | 1 | -1/+1 |
|/ | |||||
* | mysql-5.5.32 merge | Sergei Golubchik | 2013-07-16 | 1 | -1/+1 |
|\ | |||||
| * | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER | Murthy Narkedimilli | 2013-03-19 | 1 | -1/+1 |
* | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -1/+4 |
|\ \ | |||||
| * | | Merge. | Igor Babaev | 2011-06-01 | 1 | -1/+4 |
* | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -7/+8 |
|\ \ \ | |/ / | |||||
| * | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -0/+23 |
| * | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -19/+28 |
| * | | Bug#11900714 REMOVE LGPL LICENSED FILES IN MYSQL 5.1 | Magne Mahre | 2011-03-28 | 1 | -0/+89 |
| / | |||||
* | | post-merge fixes. | Sergei Golubchik | 2011-07-02 | 1 | -5/+29 |
* | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -0/+1 |
|/ | |||||
* | Bug#11933945 REMOVE LGPL LICENSED FILES IN MYSQL 5.5 | Magne Mahre | 2011-03-29 | 1 | -0/+125 |