summaryrefslogtreecommitdiff
path: root/mysql-test/main/merge.result
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.3' into 10.4Sergei Golubchik2019-09-061-5/+3
|\
| * Merge branch '10.2' into 10.3Monty2019-09-031-5/+3
* | Merge branch '10.4' into bb-10.4-mdev16188Igor Babaev2019-02-031-0/+5
|\ \
| * | MDEV-15253: Default optimizer setting changes for MariaDB 10.4Varun Gupta2018-12-091-0/+5
* | | MDEV-16188 Use in-memory PK filters built from range index scansIgor Babaev2019-02-031-6/+6
|/ /
* | MDEV-11953: support of brackets in UNION/EXCEPT/INTERSECT operationsOleksandr Byelkin2018-07-041-0/+4
|/
* Create 'main' test directory and move 't' and 'r' thereMichael Widenius2018-03-291-0/+3914