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

	Commit message (Expand)	Author	Age	Files	Lines
*	Galera after-merge fixes	Marko Mäkelä	2017-08-30	1	-3/+3
*	Merge remote-tracking branch 'origin/10.0-galera' into 10.1	Jan Lindström	2017-08-21	1	-4/+7
\|\
\| *	MW-369 FK fixes	sjaakola	2017-08-14	1	-4/+7
\| *	Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-merge	Sachin Setiya	2017-03-17	1	-4/+0
\| \|\
* \| \	Merge 10.0 into 10.1	Marko Mäkelä	2017-03-09	1	-4/+0
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Merge branch '5.5' into 10.0	Vicențiu Ciorbaru	2017-03-03	1	-4/+0
* \| \|	MDEV-11349 (1/2) Fix some clang 4.0 warnings	Marko Mäkelä	2016-11-25	1	-3/+0
* \| \|	Merge branch '10.0-galera' into bb-10.1-serg	Nirbhay Choubey	2016-08-25	1	-2/+2
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Merge branch '10.0' into 10.0-galera	Nirbhay Choubey	2016-08-24	1	-12/+13
\| \|\ \ \| \| \|/
\| * \|	Fixes for failing tests (post-merge).	Nirbhay Choubey	2016-08-21	1	-2/+2
\| * \|	Merge tag 'mariadb-10.0.23' into 10.0-galera	Nirbhay Choubey	2015-12-19	1	-6/+25
\| \|\ \
\| * \ \	bzr merge -rtag:mariadb-10.0.15 maria/10.0	Nirbhay Choubey	2014-12-05	1	-6/+6
\| \|\ \ \
\| * \ \ \	bzr merge -rtag:mariadb-10.0.14 maria/10.0/	Nirbhay Choubey	2014-09-28	1	-38/+33
\| \|\ \ \ \
\| * \| \| \| \|	Merge of innobase changes to xtradb. (r3871..3873).	Nirbhay Choubey	2014-08-12	1	-15/+6
\| * \| \| \| \|	bzr merge -r4065..4088 codership/5.6	Nirbhay Choubey	2014-05-21	1	-0/+7
\| * \| \| \| \|	bzr merge -r4209 maria/10.0.	Nirbhay Choubey	2014-05-21	1	-41/+10
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merging revision from codership-mysql/5.5 (r3928..3968) and	Nirbhay Choubey	2014-03-27	1	-0/+2
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	* bzr merge -r4027..4061 codership/5.6	Nirbhay Choubey	2014-03-26	1	-138/+119
\| * \| \| \| \| \| \|	Merging InnoDB changes to xtradb (r3783..3808).	Nirbhay Choubey	2014-03-26	1	-162/+220
\| \|/ / / / / /
\| * \| \| \| \| \|	* Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera.	Nirbhay Choubey	2014-01-30	1	-1/+1
\| * \| \| \| \| \|	Merge MariaDB-10.0.7 revision 3961.	Jan Lindström	2014-01-25	1	-2/+232
* \| \| \| \| \| \|	Merge branch '10.0' into 10.1	Sergei Golubchik	2016-08-25	1	-12/+13
\|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'merge/merge-xtradb-5.6' into 10.0	Sergei Golubchik	2016-08-10	1	-12/+13
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
\| \| * \| \| \| \|	5.6.31-77.0	Sergei Golubchik	2016-08-10	1	-12/+13
* \| \| \| \| \| \|	Merge branch '10.0' into 10.1	Sergei Golubchik	2015-12-21	1	-6/+25
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	Merge branch 'merge/merge-xtradb-5.6' into 10.0	Sergei Golubchik	2015-12-13	1	-6/+25
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| / \| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
\| \| * \| \| \|	5.6.27-76.0	Sergei Golubchik	2015-12-13	1	-6/+25
\| \| * \| \| \|	move to storage/xtradb	Sergei Golubchik	2015-05-04	1	-0/+2711
\| \| / / /
* \| \| \| \|	Merge branch '10.0' into bb-10.1-merge	Sergei Golubchik	2014-12-02	1	-6/+6
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	MDEV-6928: Add trx pointer to struct mtr_t	Jan Lindström	2014-10-24	1	-6/+6
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge 10.0.14 into 10.1	Sergei Golubchik	2014-10-15	1	-27/+27
\|\ \ \ \ \| \|/ / /
\| * \| \|	XtraDB 5.6.20-68.0	Sergei Golubchik	2014-09-11	1	-20/+14
\| \| \|/ \| \|/\|
* \| \|	fixing embedded: WaaS. Wsrep as a Service.	Sergei Golubchik	2014-10-01	1	-3/+2
* \| \|	MDEV-6247: Merge 10.0-galera to 10.1.	Jan Lindström	2014-08-26	1	-0/+288
\|/ /
* \|	xtradb 5.6.17-65.0	Sergei Golubchik	2014-05-07	1	-41/+10
\|/
*	Percona-Server-5.6.14-rel62.0 merge	Sergei Golubchik	2013-12-22	1	-0/+2748