Marko Mäkelä b05bf8ff0f Merge 10.1 to 10.2. ... Most notably, this includes MDEV-11623, which includes a fix and an upgrade procedure for the InnoDB file format incompatibility that is present in MariaDB Server 10.1.0 through 10.1.20. In other words, this merge should address MDEV-11202 InnoDB 10.1 -> 10.2 migration does not work		2017-01-19 12:06:13 +02:00
..
api	Merge 10.1 into 10.2	2016-12-30 08:56:13 +02:00
btr	Merge branch '10.1' into 10.2	2016-12-29 13:23:18 +01:00
buf	Merge 10.1 to 10.2.	2017-01-19 12:06:13 +02:00
data
dict	Merge 10.1 to 10.2.	2017-01-19 12:06:13 +02:00
dyn
eval
fil	Merge 10.1 to 10.2.	2017-01-19 12:06:13 +02:00
fsp	MDEV-11623 MariaDB 10.1 fails to start datadir created with	2017-01-15 19:05:50 +02:00
fts	MDEV-11233 CREATE FULLTEXT INDEX with a token longer than 127 bytes	2016-12-05 16:32:03 +02:00
fut	Part 1 of MDEV-8139 Fix scrubbing tests	2017-01-04 18:21:42 +02:00
ha
handler	Merge 10.1 into 10.2	2017-01-07 15:35:34 +02:00
ibuf	MDEV-11349 (1/2) Fix some clang 4.0 warnings	2016-11-25 12:43:34 +02:00
include	Merge 10.1 to 10.2.	2017-01-19 12:06:13 +02:00
lock	MDEV-11638 Encryption causes race conditions in InnoDB shutdown	2017-01-05 00:20:06 +02:00
log	Merge 10.1 to 10.2	2017-01-05 10:48:03 +02:00
mach
mem
mtr
mysql-test/storage_engine
os	Merge 10.1 into 10.2	2016-12-30 08:56:13 +02:00
page	MDEV-11349 (1/2) Fix some clang 4.0 warnings	2016-11-25 12:43:34 +02:00
pars
que
read
rem	Merge 10.0 into 10.1	2017-01-04 13:56:11 +02:00
row	Merge 10.1 to 10.2.	2017-01-19 12:06:13 +02:00
srv	Merge 10.1 to 10.2.	2017-01-19 12:06:13 +02:00
sync	MDEV-11349 (1/2) Fix some clang 4.0 warnings	2016-11-25 12:43:34 +02:00
trx	Merge 10.1 to 10.2	2017-01-05 10:48:03 +02:00
usr
ut	Revert "Merge pull request #275 from grooverdan/10.2-MDEV-11075-crc32-runtime-detect-getauxval"	2016-12-20 22:46:29 +02:00
CMakeLists.txt	MDEV-11195: Simplify enablement of NUMA in innodb/xtradb	2016-11-02 14:37:43 +11:00
COPYING.Google
COPYING.Percona
Doxyfile
ha_innodb.def