7 commits

Author	SHA1	Message	Date
Sergei Golubchik	25d9d2e37f	Merge branch 'bb-10.4-release' into bb-10.5-release	2021-02-15 16:43:15 +01:00
Sergei Golubchik	00a313ecf3	Merge branch 'bb-10.3-release' into bb-10.4-release ... Note, the fix for "MDEV-23328 Server hang due to Galera lock conflict resolution" was null-merged. 10.4 version of the fix is coming up separately	2021-02-12 17:44:22 +01:00
Sergei Golubchik	60ea09eae6	Merge branch '10.2' into 10.3	2021-02-01 13:49:33 +01:00
Vicențiu Ciorbaru	45bc7574fb	MDEV-18650: Options deprecated in previous versions - storage_engine ... Remove usage of deprecated variable storage_engine. It was deprecated in 5.5 but it never issued a deprecation warning. Make it issue a warning in 10.5.1. Replaced with default_storage_engine.	2020-02-13 13:42:01 +02:00
Alexander Barkov	3c6065a270	MDEV-8844 Unreadable control characters printed as is in warnings	2019-12-06 18:51:05 +04:00
Varun Gupta	93c360e3a5	MDEV-15253: Default optimizer setting changes for MariaDB 10.4 ... use_stat_tables= PREFERABLY optimizer_use_condition_selectivity= 4	2018-12-09 09:22:00 +05:30
Michael Widenius	a7abddeffa	Create 'main' test directory and move 't' and 'r' there	2018-03-29 13:59:44 +03:00

Renamed from mysql-test/r/mix2_myisam.result (Browse further)