summaryrefslogtreecommitdiff
path: root/mysql-test/main/mysqld--help,win.rdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.4 into 10.5Marko Mäkelä2020-08-101-14/+0
|\
| * Merge 10.3 into 10.4Marko Mäkelä2020-08-101-14/+0
| |\
| | * Merge 10.2 into 10.3Marko Mäkelä2020-08-101-14/+0
* | | Merge pull request #1221 from grooverdan/10.4-MDEV-18851-multiple-sized-large...Daniel Black2020-04-021-16/+0
|/ /
* | Merge branch '10.3' into 10.4Oleksandr Byelkin2020-02-111-16/+18
|\ \ | |/
| * Merge branch '10.2' into 10.3Oleksandr Byelkin2020-02-101-16/+18
* | MDEV-16536 Remove shared memory transportVladislav Vaintroub2018-08-201-32/+13
|/
* Merge remote-tracking branch '10.2' into 10.3Vicențiu Ciorbaru2018-04-121-2/+2
* Create 'main' test directory and move 't' and 'r' thereMichael Widenius2018-03-291-0/+124