Marko Mäkelä 51af19851a MDEV-11454 post-merge fix: ... buf_dump(): Correct the printf format passed to buf_dump_status() to match the argument types. Revert the changes to storage/xtradb. XtraDB is not being compiled for 10.2. The unused copy that we have in the 10.2 branch is only getting merges from 10.1. Disable the test sys_vars.innodb_buffer_pool_dump_pct_function because it is unstable on buildbot.		2017-02-24 22:12:01 +02:00
..
api	Merge 10.1 into 10.2	2016-12-30 08:56:13 +02:00
btr
buf	MDEV-11454 post-merge fix:	2017-02-24 22:12:01 +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
fut	Part 1 of MDEV-8139 Fix scrubbing tests	2017-01-04 18:21:42 +02:00
ha
handler	Merge branch 'bb-10.2-serg-merge' into 10.2	2017-02-11 09:45:34 +01:00
ibuf
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 branch '10.1' into 10.2	2017-02-10 17:01:45 +01:00
mach
mem
mtr
mysql-test/storage_engine
os	Merge 10.1 into 10.2	2016-12-30 08:56:13 +02:00
page
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 branch '10.1' into 10.2	2017-02-10 17:01:45 +01:00
sync
trx	Merge 10.1 to 10.2	2017-01-05 10:48:03 +02:00
usr
ut
CMakeLists.txt
COPYING.Google
COPYING.Percona
Doxyfile
ha_innodb.def