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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge 10.0 into 10.1	Marko Mäkelä	2017-01-04	1	-81/+4
\|\
\| *	MDEV-11694 InnoDB tries to create unused table SYS_ZIP_DICTbb-10.0-mdev-11694	Marko Mäkelä	2017-01-03	1	-81/+4
* \|	Merge branch '10.0-galera' into 10.1	Sergei Golubchik	2016-11-02	1	-3/+82
\|\ \ \| \|/
\| *	Merge branch 'merge/merge-xtradb-5.6' into 10.0	Sergei Golubchik	2016-10-25	1	-3/+82
\| \|\
\| \| *	5.6.33-79.0	Sergei Golubchik	2016-10-25	1	-3/+82
* \| \|	Merge branch '10.0' into 10.1	Sergei Golubchik	2016-08-25	1	-21/+21
\|\ \ \ \| \|/ /
\| * \|	Merge branch 'merge/merge-xtradb-5.6' into 10.0	Sergei Golubchik	2016-08-10	1	-22/+22
\| \|\ \ \| \| \|/
\| \| *	5.6.31-77.0	Sergei Golubchik	2016-08-10	1	-22/+22
\| \| *	move to storage/xtradb	Sergei Golubchik	2015-05-04	1	-0/+915
* \|	Merge branch '10.0' into 10.1	Sergei Golubchik	2016-06-28	1	-0/+3
\|\ \ \| \|/
\| *	Merge following commit from 5.5:	Jan Lindström	2016-06-23	1	-0/+3
* \|	MDEV-8589: Non-default ENCRYPTION_KEY_ID is ignored upon reading a table	Jan Lindström	2015-08-14	1	-1/+4
* \|	Merge branch '10.0' into bb-10.1-merge	Sergei Golubchik	2014-12-02	1	-0/+8
\|\ \ \| \|/
\| *	XtraDB 5.6.21-70.0	Sergei Golubchik	2014-11-20	1	-0/+8
* \|	MDEV-6929: Port Facebook Prefix Index Queries Optimization	Jan Lindström	2014-11-03	1	-1/+9
\|/
*	Percona-Server-5.6.14-rel62.0 merge	Sergei Golubchik	2013-12-22	1	-90/+164
*	Percona-Server-5.5.33-rel31.1.tar.gz	Sergei Golubchik	2013-09-07	1	-2/+2
*	merged with XtraDB 1.1.8-26.0	Sergei Golubchik	2012-06-15	1	-3/+5
*	5.3->5.5 merge	Sergei Golubchik	2011-11-22	1	-18/+11
\|\
\| *	Merge.	Igor Babaev	2011-06-01	1	-18/+11
\| \|\
\| \| *	Downported InnoDB support of Index Condition Pushdown from MySQL-5.6 code line.	Igor Babaev	2011-05-25	1	-18/+11
* \| \|	merge with 5.3	Sergei Golubchik	2011-10-19	1	-1/+10
\|\ \ \ \| \|/ /
\| * \|	Merge with MariaDB 5.2	Michael Widenius	2011-05-10	1	-0/+8
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	Merge XtraDB from Percona Server 5.1.56-12.7 into MariaDB-5.1.	unknown	2011-04-29	1	-0/+8
\| * \|	Fix for lp:711565 "Index Condition Pushdown can make a thread hold MyISAM loc...	Michael Widenius	2011-02-18	1	-1/+10
\| * \|	Merge with 5.1-release.	Michael Widenius	2010-12-06	1	-0/+4
\| \|\ \ \| \| \|/
\| \| *	Merge of innodb_plugin for MySQL 5.1.53 with xtradb	Michael Widenius	2010-11-25	1	-0/+4
* \| \|	merge with xtradb-5.5.15	Sergei Golubchik	2011-07-18	1	-2/+25
\|/ /
* \|	5.2 merge	Sergei Golubchik	2010-10-28	1	-1/+5
\|\ \ \| \|/
\| *	Merge XtraDB from Percona-server-5.1.51-12 into MariaDB.	unknown	2010-10-19	1	-1/+5
* \|	Merge 5.2->5.3	Sergey Petrunya	2010-10-10	1	-43/+52
\|\ \ \| \|/
\| *	Merge XtraDB from Percona server 5.1.49-12 into MariaDB.	unknown	2010-09-03	1	-37/+35
\| *	Merge XtraDB from Percona-Server-5.1.47-11 into MariaDB.	unknown	2010-08-04	1	-6/+17
* \|	Merge MariaDB-5.2 -> MariaDB 5.3	Sergey Petrunya	2010-03-20	1	-259/+259
\|\ \ \| \|/
\| *	Merge XtraDB 9 into MariaDB.	unknown	2010-01-15	1	-3/+3
\| *	Merge XtraDB 8 into MariaDB.	unknown	2009-11-13	1	-256/+256
* \|	MWL#67: MRR backport	Sergey Petrunya	2009-12-22	1	-1/+1
* \|	Backport into MariaDB-5.2 the following:	Sergey Petrunya	2009-12-15	1	-0/+10
\|/
*	Merge xtradb-7 -> MariaDB	Sergey Petrunya	2009-09-08	1	-0/+15
*	Import Percona XtraDB into the MariaDB source tree.	unknown	2009-06-09	1	-0/+769