6 Commits

Author	SHA1	Message	Date
Marko Mäkelä	18795f5512	Merge 10.3 into 10.4	2022-09-13 16:36:38 +03:00
Alexander Barkov	f1544424de	MDEV-29446 Change SHOW CREATE TABLE to display default collation	2022-09-12 22:10:39 +04:00
Marko Mäkelä	514b305dfb	Merge 10.3 into 10.4 ... The MDEV-17262 commit 26432e49d3 was skipped. In Galera 4, the implementation would seem to require changes to the streaming replication. In the tests archive.rnd_pos main.profiling, disable_ps_protocol for SHOW STATUS and SHOW PROFILE commands until MDEV-18974 has been fixed.	2019-03-20 10:41:32 +02:00
Sergei Golubchik	b64fde8f38	Merge branch '10.2' into 10.3	2019-03-17 13:06:41 +01:00
Oleksandr Byelkin	de745ecf29	MDEV-11953: support of brackets in UNION/EXCEPT/INTERSECT operations	2018-07-04 19:13:55 +02:00
Michael Widenius	a7abddeffa	Create 'main' test directory and move 't' and 'r' there	2018-03-29 13:59:44 +03:00