summaryrefslogtreecommitdiff
path: root/mysql-test/main/merge.result
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.5 into 10.6Marko Mäkelä2022-09-201-45/+45
|\
| * Merge remote-tracking branch 'origin/10.4' into 10.5Alexander Barkov2022-09-141-45/+45
| |\
| | * Merge 10.3 into 10.4Marko Mäkelä2022-09-131-45/+45
| | |\
| | | * MDEV-29446 Change SHOW CREATE TABLE to display default collationAlexander Barkov2022-09-121-45/+45
* | | | MDEV-7317: Make an index ignorable to the optimizerVarun Gupta2021-03-041-4/+4
|/ / /
* | | MDEV-18650: Options deprecated in previous versions - storage_engineVicențiu Ciorbaru2020-02-131-1/+1
|/ /
* | 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