Marko Mäkelä 814ae57daf Merge 10.1 into 10.2

2018-08-03 13:02:56 +03:00

..

api

Merge branch 'github/10.1' into 10.2

2018-02-06 14:50:50 +01:00

btr

Merge 10.1 into 10.2

2018-06-06 11:25:33 +03:00

buf

Merge 10.1 into 10.2

2018-08-03 13:02:56 +03:00

data

Merge remote-tracking branch '5.5' into 10.0

2018-01-24 12:29:31 +02:00

dict

Merge 10.1 into 10.2

2018-08-03 13:02:56 +03:00

dyn

Fix compiler error on gcc 6.x and most of the compiler warnings.

2017-04-05 10:50:12 +03:00

eval

…

fil

Merge branch '10.1' into 10.2

2018-06-21 23:47:39 +02:00

fsp

Merge 10.1 into 10.2

2018-05-29 16:52:12 +03:00

fts

Merge 10.0 into 10.1

2018-08-03 12:03:10 +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

2018-08-02 08:19:57 +03:00

ibuf

MDEV-13103 Deal with page_compressed page corruption

2018-06-14 13:46:07 +03:00

include

Merge 10.1 into 10.2

2018-08-03 13:02:56 +03:00

lock

Merge tag 'mariadb-10.0.35' into 10.0-galera

2018-05-07 17:20:39 +03:00

log

Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera

2018-05-07 13:49:14 +03:00

mach

5.5.55-38.8

2017-07-18 19:47:01 +02:00

mem

Merge 5.5 into 10.0

2018-03-20 18:36:03 +02:00

mtr

Fix compiler error on gcc 6.x and most of the compiler warnings.

2017-04-05 10:50:12 +03:00

mysql-test/storage_engine

Merge branch '10.1' into 10.2

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

os

Merge 10.1 into 10.2

2018-08-02 08:19:57 +03:00

page

Merge 10.0 into 10.1

2018-04-24 09:26:40 +03:00

pars

Merge branch 'merge-xtradb-5.6' into 10.0

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

que

…

read

…

rem

Merge tag 'mariadb-5.5.60' into 5.5-galera

2018-04-24 13:34:57 +03:00

row

Merge 10.1 into 10.2

2018-08-03 13:02:56 +03:00

srv

Merge branch '10.1' into 10.2

2018-04-10 17:43:18 +03:00

sync

5.6.38-83.0

2018-01-23 18:04:34 +02:00

trx

Fix -Wclass-memaccess in WSREP,InnoDB,XtraDB

2018-08-03 12:21:13 +03:00

usr

Remove redundant UT_LIST_INIT() calls

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

ut

Merge branch '10.1' into 10.2

2018-05-10 13:01:42 +02:00

CMakeLists.txt

Merge branch '10.1' into 10.2

2018-05-10 13:01:42 +02:00

COPYING.Google

…

COPYING.Percona

…

Doxyfile

…

ha_innodb.def

…