Marko Mäkelä 2000a9009b Merge 10.1 into 10.2

2017-08-31 11:14:28 +03:00

..

api

Merge 10.1 into 10.2

2017-05-05 10:38:53 +03:00

btr

Merge 10.1 into 10.2

2017-08-31 11:14:28 +03:00

buf

Merge 10.1 into 10.2

2017-08-31 09:30:40 +03:00

data

5.6.31-77.0

2016-08-10 19:24:58 +02:00

dict

Merge branch '10.1' into 10.2

2017-08-17 11:38:34 +02:00

dyn

Merge branch '5.5' into 10.0

2017-03-03 01:37:54 +02:00

eval

move to storage/xtradb

2015-05-04 19:15:28 +02:00

fil

Merge 10.1 into 10.2

2017-08-31 11:14:28 +03:00

fsp

Merge 10.1 into 10.2

2017-08-31 09:30:40 +03:00

fts

Merge 10.0 into 10.1

2017-05-20 08:41:20 +03:00

fut

Part 1 of MDEV-8139 Fix scrubbing tests

2017-01-04 18:21:42 +02:00

ha

5.6.30-76.3

2016-06-21 14:20:09 +02:00

handler

Merge 10.1 into 10.2

2017-08-31 09:30:40 +03:00

ibuf

Merge 10.0 into 10.1

2017-08-28 15:05:46 +03:00

include

Merge 10.1 into 10.2

2017-08-31 11:14:28 +03:00

lock

Merge tag 'mariadb-10.0.31' into 10.0-galera

2017-05-30 15:28:52 +05:30

log

Merge branch '10.0' into 10.1

2017-08-30 13:06:13 +03:00

mach

5.6.35-80.0

2017-03-04 20:50:02 +02:00

mem

5.6.31-77.0

2016-08-10 19:24:58 +02:00

mtr

Merge 10.0 into 10.1

2017-03-09 08:53:08 +02:00

mysql-test/storage_engine

Merge branch '10.1' into 10.2

2017-08-17 11:38:34 +02:00

os

Merge tag 'mariadb-10.0.32' into 10.0-galera

2017-08-09 08:56:11 +03:00

page

MDEV-13247 innodb_log_compressed_pages=OFF breaks crash recovery of ROW_FORMAT=COMPRESSED tables

2017-07-06 14:18:53 +03:00

pars

Merge branch 'merge-xtradb-5.6' into 10.0

2017-05-17 12:11:12 +03:00

que

5.6.24-72.2

2015-06-16 11:04:40 +02:00

read

move to storage/xtradb

2015-05-04 19:15:28 +02:00

rem

Merge tag 'mariadb-10.0.31' into 10.0-galera

2017-05-30 15:28:52 +05:30

row

Merge 10.1 into 10.2

2017-08-31 09:30:40 +03:00

srv

Merge 10.1 into 10.2

2017-08-31 11:14:28 +03:00

sync

Silence bogus GCC 7 warnings -Wimplicit-fallthrough

2017-05-17 08:27:04 +03:00

trx

Fix test failures on embedded server.

2017-08-31 08:38:26 +03:00

usr

Remove redundant UT_LIST_INIT() calls

2017-05-17 10:33:49 +03:00

ut

Merge 10.1 into 10.2

2017-05-05 10:38:53 +03:00

CMakeLists.txt

Merge branch '10.1' into 10.2

2017-08-17 11:38:34 +02:00

COPYING.Google

move to storage/xtradb

2015-05-04 19:15:28 +02:00

COPYING.Percona

move to storage/xtradb

2015-05-04 19:15:28 +02:00

Doxyfile

move to storage/xtradb

2015-05-04 19:15:28 +02:00

ha_innodb.def

move to storage/xtradb

2015-05-04 19:15:28 +02:00