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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge 10.2 into 10.3	Marko Mäkelä	2019-07-02	1	-44/+52
\|\
\| *	Merge from MyRocks upstream:	Sergei Petrunia	2019-06-16	1	-44/+52
\| \|\
\| \| *	Copy of	Sergei Petrunia	2019-06-15	1	-44/+52
* \| \|	Merge 10.2 into 10.3	Marko Mäkelä	2018-11-06	1	-1/+1
\|\ \ \ \| \|/ /
\| * \|	MDEV-14267: correct FSF address	Daniel Black	2018-10-30	1	-1/+1
* \| \|	Merge 10.2 into 10.3	Marko Mäkelä	2018-09-06	1	-36/+25
\|\ \ \ \| \|/ /
\| * \|	Merge branch 'merge-myrocks' of github.com:MariaDB/mergetrees into bb-10.2-ma...	Sergei Petrunia	2018-08-28	1	-36/+25
\| \|\ \ \| \| \|/
\| \| *	Copy of	Sergei Petrunia	2018-08-28	1	-36/+25
* \| \|	Merge 10.2 into 10.3	Marko Mäkelä	2018-05-12	1	-61/+84
\|\ \ \ \| \|/ /
\| * \|	Merge from merge-myrocks:	Sergei Petrunia	2018-01-27	1	-61/+84
\| \|\ \ \| \| \|/
\| \| *	Copy of	Sergei Petrunia	2018-01-27	1	-61/+84
* \| \|	Enusure that my_global.h is included first	Michael Widenius	2017-08-24	1	-1/+3
\|/ /
* \|	Merge branch 'merge-myrocks' of github.com:MariaDB/mergetrees into bb-10.2-ma...	Sergei Petrunia	2017-03-11	1	-4/+18
\|\ \ \| \|/
\| *	Copy of	Sergei Petrunia	2017-03-11	1	-4/+18
* \|	Merge between local changes bb-10.2-mariarocks and the merge from upstream	Sergei Petrunia	2017-02-20	1	-4/+8
\|\ \
\| * \|	MDEV-11901 : MariaRocks on Windows	Vladislav Vaintroub	2017-02-01	1	-5/+8
* \| \|	Merge 'merge-myrocks' into 'bb-10.2-mariarocks'	Sergei Petrunia	2017-02-19	1	-178/+120
\|\ \ \ \| \|/ / \|/\| / \| \|/
\| *	Copy of	Sergei Petrunia	2017-02-06	1	-178/+120
* \|	Merge remote-tracking branch 'mergetrees/merge-myrocks' into 10.2-mariarocks	Sergei Petrunia	2017-01-01	1	-20/+27
\|\ \ \| \|/
\| *	Copy of	Sergei Petrunia	2016-12-31	1	-20/+27
* \|	Add #include <my_config.h> at the start of every .cc file	Sergei Petrunia	2016-10-09	1	-0/+2
\|/
*	Initial commit,	Sergei Petrunia	2016-10-06	1	-0/+555