Marko Mäkelä 4e7b382d31 Merge 10.1 to 10.2 ... Most conflicts are related to the MDEV-11638 InnoDB shutdown refactoring.		2017-01-05 10:48:03 +02:00
..
log0crypt.cc	Fixed compiler warnings and test failures found by buildbot	2016-06-24 02:25:14 +03:00
log0log.cc	MDEV-11638 Encryption causes race conditions in InnoDB shutdown	2017-01-05 00:20:06 +02:00
log0online.cc	MDEV-9282 Debian: the Lintian complains about "shlib-calls-exit" in ha_innodb.so	2016-12-28 15:54:24 +02:00
log0recv.cc	MDEV-11556 InnoDB redo log apply fails to adjust data file sizes	2016-12-30 09:52:24 +02:00