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
..
srv0conc.cc	Merge branch '10.1' into 10.2	2016-06-30 16:38:05 +02:00
srv0mon.cc	Merge branch '10.0' into 10.1	2016-09-28 17:55:28 +02:00
srv0srv.cc	Merge 10.1 to 10.2	2017-01-05 10:48:03 +02:00
srv0start.cc	Merge 10.1 to 10.2.	2017-01-19 12:06:13 +02:00