delta/mariadb-git.git - github.com: MariaDB/server.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'bb-10.4-release' into bb-10.5-release	Sergei Golubchik	2021-02-15	1	-0/+1
\|\
\| *	Merge branch 'bb-10.3-release' into bb-10.4-release	Sergei Golubchik	2021-02-12	1	-0/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| *	Merge branch '10.2' into 10.3	Sergei Golubchik	2021-02-01	1	-0/+1
\| \| \|
* \| \|	MDEV-18650: Options deprecated in previous versions - storage_engine	Vicențiu Ciorbaru	2020-02-13	1	-3/+3
\|/ / \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \|	Merge remote-tracking branch 'origin/10.3' into 10.4	Alexander Barkov	2019-10-01	1	-0/+19
\|\ \ \| \|/
\| *	Merge remote-tracking branch 'origin/10.2' into 10.3	Alexander Barkov	2019-10-01	1	-0/+19
\| \|
* \|	Merge branch '10.3' into 10.4	Sergei Golubchik	2019-09-06	1	-0/+2
\|\ \ \| \|/
\| *	Merge branch '10.2' into 10.3	Monty	2019-09-03	1	-0/+2
\| \|
* \|	Merge 10.3 into 10.4	Marko Mäkelä	2019-04-25	1	-0/+8
\|/ \| \| \| \|	In is_eits_usable(), we disable an assertion that fails due to MDEV-19334.
*	Merge remote-tracking branch '10.2' into 10.3	Vicențiu Ciorbaru	2018-04-12	1	-3/+4
\|
*	Create 'main' test directory and move 't' and 'r' there	Michael Widenius	2018-03-29	1	-0/+1801