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
..
buf0buddy.cc	5.6.31-77.0	2016-08-10 19:24:58 +02:00
buf0buf.cc	Merge branch '10.1' into 10.2	2016-12-29 13:23:18 +01:00
buf0checksum.cc
buf0dblwr.cc	MDEV-11623 MariaDB 10.1 fails to start datadir created with	2017-01-15 19:05:50 +02:00
buf0dump.cc	MDEV-11638 Encryption causes race conditions in InnoDB shutdown	2017-01-05 00:20:06 +02:00
buf0flu.cc	Merge branch '10.1' into 10.2	2016-12-29 13:23:18 +01:00
buf0lru.cc	Merge branch '10.0' into 10.1	2016-08-25 12:40:09 +02:00
buf0mtflu.cc
buf0rea.cc	MDEV-8588: Assertion failure in file ha_innodb.cc line 21140 if at least one encrypted table exists and encryption service is not available	2015-09-04 20:19:45 +03:00