summaryrefslogtreecommitdiff
path: root/mysql-test/main/loaddata.test
Commit message (Collapse)AuthorAgeFilesLines
* Merge 10.3 into 10.4Marko Mäkelä2019-03-061-0/+45
|\
| * Merge 10.2 into 10.3Marko Mäkelä2019-03-051-0/+45
|/ | | | | | FIXME: Properly resolve conflicts between MDEV-18883 and MDEV-7742/MDEV-8305, and record the correct result for main.log_slow
* Create 'main' test directory and move 't' and 'r' thereMichael Widenius2018-03-291-0/+718