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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge 10.4 into 10.5	Marko Mäkelä	2019-08-13	1	-44/+70
\|\
\| *	Merge 10.2 into 10.3	Marko Mäkelä	2019-07-02	1	-44/+73
\| \|\
\| \| *	Merge from MyRocks upstream:	Sergei Petrunia	2019-06-16	1	-44/+73
\| \| \|\
\| \| \| *	Copy of	Sergei Petrunia	2019-06-15	1	-44/+73
* \| \| \|	MDEV-19836 Reuse new I_S table definition helper classes for RocksDB	Alexander Barkov	2019-06-24	1	-121/+101
\|/ / /
* \| \|	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	-1/+166
\|\ \ \ \| \|/ /
\| * \|	MyRocks: post-merge fixes: Make it compile on Windows.	Sergei Petrunia	2018-08-31	1	-1/+1
\| * \|	MyRocks: Post-merge testcase fixes part #4	Sergei Petrunia	2018-08-28	1	-1/+1
\| * \|	Merge branch 'merge-myrocks' of github.com:MariaDB/mergetrees into bb-10.2-ma...	Sergei Petrunia	2018-08-28	1	-1/+166
\| \|\ \ \| \| \|/
\| \| *	Copy of	Sergei Petrunia	2018-08-28	1	-1/+166
* \| \|	Merge 10.2 into 10.3	Marko Mäkelä	2018-05-12	1	-2/+147
\|\ \ \ \| \|/ /
\| * \|	Merge branch 'bb-10.2-mariarocks-merge' of github.com:MariaDB/server into 10.2	Sergei Petrunia	2018-05-07	1	-2/+147
\| \|\ \
\| \| * \|	Post-merge fixes: MariaDB-fication of rdb_i_s_deadlock_info	Sergei Petrunia	2018-02-01	1	-2/+2
\| \| * \|	Merge from merge-myrocks:	Sergei Petrunia	2018-01-27	1	-2/+147
\| \| \|\ \ \| \| \| \|/
\| \| \| *	Copy of	Sergei Petrunia	2018-01-27	1	-2/+147
* \| \| \|	Merge 10.2 into 10.3	Marko Mäkelä	2018-03-29	1	-0/+33
\|\ \ \ \ \| \|/ / /
\| * \| \|	MDEV-15686: Loading MyRocks plugin back after it has been unloaded causes a c...	Sergei Petrunia	2018-03-28	1	-0/+33
\| \|/ /
* \| \|	Merge bb-10.2-ext into 10.3	Marko Mäkelä	2018-01-13	1	-1/+0
\|\ \ \ \| \|/ /
\| * \|	MDEV-14372: Fix and enable rocksdb.information_schema test	Sergei Petrunia	2018-01-12	1	-1/+0
* \| \|	Merge bb-10.2-ext into 10.3	Marko Mäkelä	2017-12-19	1	-11/+11
\|\ \ \ \| \|/ /
\| * \|	MDEV-14679: RocksdB plugin fails to load with "Loading of unknown plugin ROCK...	Sergei Petrunia	2017-12-16	1	-11/+11
* \| \|	Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3	Alexander Barkov	2017-10-30	1	-5/+11
\|\ \ \ \| \|/ /
\| * \|	Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocks-merge	Sergei Petrunia	2017-09-19	1	-0/+2
\| \|\ \
\| * \ \	Merge mergetrees/merge-myrocks into bb-10.2-mariarocks-merge	Sergei Petrunia	2017-09-18	1	-148/+213
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	Copy of	Sergei Petrunia	2017-09-15	1	-5/+10
* \| \| \|	Enusure that my_global.h is included first	Michael Widenius	2017-08-24	1	-1/+1
\| \|_\|/ \|/\| \|
* \| \|	Merge MyRocks merge tree into bb-10.2-mariarocks, unfinished.	Sergei Petrunia	2017-07-29	1	-143/+204
\|\ \ \ \| \|/ / \|/\| / \| \|/
\| *	Copy of	Sergei Petrunia	2017-07-28	1	-143/+202
* \|	Merge branch 'merge-myrocks' of github.com:MariaDB/mergetrees into bb-10.2-ma...	Sergei Petrunia	2017-03-11	1	-7/+3
\|\ \ \| \|/
\| *	Copy of	Sergei Petrunia	2017-03-11	1	-7/+3
* \|	Merge between local changes bb-10.2-mariarocks and the merge from upstream	Sergei Petrunia	2017-02-20	1	-3/+3
\|\ \
\| * \|	MDEV-11901 : MariaRocks on Windows	Vladislav Vaintroub	2017-02-01	1	-3/+3
* \| \|	Merge 'merge-myrocks' into 'bb-10.2-mariarocks'	Sergei Petrunia	2017-02-19	1	-860/+876
\|\ \ \ \| \|/ / \|/\| / \| \|/
\| *	Copy of	Sergei Petrunia	2017-02-06	1	-860/+876
* \|	Merge remote-tracking branch 'mergetrees/merge-myrocks' into 10.2-mariarocks	Sergei Petrunia	2017-01-01	1	-217/+596
\|\ \ \| \|/
\| *	Copy of	Sergei Petrunia	2016-12-31	1	-217/+596
* \|	MariaRocks port: compilation fixes	Sergei Petrunia	2016-10-21	1	-8/+8
* \|	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/+1189