7 Commits

Author	SHA1	Message	Date
Julius Goryavsky	3376668ca8	Merge branch 10.2 into 10.3	2021-12-23 14:14:04 +01:00
Oleksandr Byelkin	3c9bc0ce19	Merge branch '10.2' into 10.3	2020-03-11 14:05:41 +01:00
Marko Mäkelä	a2fc36989e	Merge 10.2 into 10.3	2019-03-04 17:01:00 +02:00
Oleksandr Byelkin	65c5ef9b49	dirty merge	2019-02-07 13:59:31 +01:00
Marko Mäkelä	9477a2a9ba	Merge 10.2 into 10.3	2018-04-25 07:59:25 +03:00
Marko Mäkelä	d71a8855ee	Merge 10.2 to 10.3 ... Temporarily disable main.cte_recursive due to hang in an added test related to MDEV-15575.	2018-04-19 15:23:21 +03:00
Michael Widenius	a7abddeffa	Create 'main' test directory and move 't' and 'r' there	2018-03-29 13:59:44 +03:00