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
..
dict0boot.cc	Merge InnoDB 5.7 from mysql-5.7.14.	2016-09-08 15:49:03 +03:00
dict0crea.cc	MDEV-11816 Disallow CREATE TEMPORARY TABLE…ROW_FORMAT=COMPRESSED	2017-01-18 08:42:57 +02:00
dict0defrag_bg.cc	fix build and some warnings	2016-11-24 17:36:02 +03:00
dict0dict.cc	Merge 10.1 to 10.2.	2017-01-19 12:06:13 +02:00
dict0load.cc	Merge 10.1 to 10.2.	2017-01-19 12:06:13 +02:00
dict0mem.cc	Remove MYSQL_TABLESPACES.	2017-01-18 08:30:43 +02:00
dict0stats.cc	MDEV-11690 Remove UNIV_HOTBACKUP	2016-12-30 16:05:42 +02:00
dict0stats_bg.cc	Merge 10.1 to 10.2	2017-01-05 10:48:03 +02:00