17 Commits

Author	SHA1	Message	Date
Marko Mäkelä	af91266498	Merge 10.3 into 10.4 ... In main.index_merge_myisam we remove the test that was added in commit a2d24def8c because it duplicates the test case that was added in commit 5af12e4635.	2020-04-16 12:12:26 +03:00
Marko Mäkelä	84db10f27b	Merge 10.2 into 10.3	2020-04-15 09:56:03 +03:00
Sergei Golubchik	244f0e6dd8	Merge branch '10.3' into 10.4	2019-09-06 11:53:10 +02:00
Monty	a071e0e029	Merge branch '10.2' into 10.3	2019-09-03 13:17:32 +03:00
Marko Mäkelä	f98bb23168	Merge 10.3 into 10.4	2019-05-29 22:17:00 +03:00
Marko Mäkelä	90a9193685	Merge 10.2 into 10.3	2019-05-29 11:32:46 +03:00
Oleksandr Byelkin	c07325f932	Merge branch '10.3' into 10.4	2019-05-19 20:55:37 +02:00
Marko Mäkelä	3d56adbfac	Merge 10.2 into 10.3	2019-05-16 14:24:29 +03:00
Marko Mäkelä	734510a44d	Merge 10.3 into 10.4	2019-01-06 17:43:02 +02:00
Sergei Golubchik	6bb11efa4a	Merge branch '10.2' into 10.3	2019-01-03 13:09:41 +01:00
Daniel Black	92bde77826	my_print_defaults: remove --config-file/extra-file ... There have been deprecated since before 5.5 Closes #548	2018-10-31 16:06:15 +01:00
Marko Mäkelä	d88c136b9f	Merge 10.3 into 10.4	2018-10-17 19:11:42 +03:00
Alexander Barkov	6120ae4aca	Adjusting old tests and adding new tests for "MDEV-8765: mysqldump -use utf8mb4 by default"	2018-10-12 06:34:13 +04:00
Oleksandr Byelkin	de745ecf29	MDEV-11953: support of brackets in UNION/EXCEPT/INTERSECT operations	2018-07-04 19:13:55 +02:00
Sergei Golubchik	36e59752e7	Merge branch '10.2' into 10.3	2018-06-30 16:39:20 +02:00
Daniel Black	c9839cb0b3	MDEV-13336: mysqldump --ignore-database address review comments	2018-04-16 13:39:41 +04:00
Michael Widenius	a7abddeffa	Create 'main' test directory and move 't' and 'r' there	2018-03-29 13:59:44 +03:00