Jan Lindström d6ee7ab1a1 Merge remote-tracking branch 'origin/10.0' into bb-10.0-galera

2018-10-31 08:46:37 +02:00

..

api

Revert "MDEV-6928: Add trx pointer to struct mtr_t"

2018-01-29 11:05:17 +02:00

btr

Revert "MDEV-6928: Add trx pointer to struct mtr_t"

2018-01-29 11:05:17 +02:00

buf

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

2018-10-31 08:46:37 +02:00

data

Merge remote-tracking branch '5.5' into 10.0

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

dict

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

2018-10-31 08:46:37 +02:00

dyn

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

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

eval

move to storage/xtradb

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

fil

MDEV-16124 fil_rename_tablespace() times out and crashes server during table-rebuilding ALTER TABLE

2018-06-05 18:16:12 +03:00

fsp

Merge branch 'merge/merge-xtradb-5.5' into 5.5

2018-10-24 11:09:16 +02:00

fts

Merge branch 'merge/merge-xtradb-5.6' into 10.0

2018-10-28 10:04:36 +01:00

fut

move to storage/xtradb

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

ha

5.6.30-76.3

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

handler

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

2018-10-31 08:46:37 +02:00

ibuf

MDEV-12173 "Error: trying to do an operation on a dropped tablespace"

2018-01-22 16:58:13 +02:00

include

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

2018-10-31 08:46:37 +02:00

lock

Merge tag 'mariadb-10.0.35' into 10.0-galera

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

log

5.6.41-84.1

2018-10-27 20:53:19 +02: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

MDEV-12915 ST_Centroid does not return the same result than MySQL

2017-08-01 09:52:59 +02:00

os

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

2018-10-31 08:46:37 +02:00

page

5.6.41-84.1

2018-10-27 20:53:19 +02:00

pars

Merge branch 'merge/merge-xtradb-5.6' into 10.0

2018-10-28 10:04:36 +01: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-5.5.60' into 5.5-galera

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

row

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

2018-10-31 08:46:37 +02:00

srv

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

2018-10-31 08:46:37 +02:00

sync

5.5.61-38.13

2018-10-24 10:30:31 +02:00

trx

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

2018-10-31 08:46:37 +02:00

usr

Remove redundant UT_LIST_INIT() calls

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

ut

Merge branch 'merge-xtradb-5.6' into 10.0

2018-04-26 14:13:58 +02:00

wsrep

MDEV#5626 : Cannot install InnoDB/XtraDB plugin

2014-02-10 09:22:24 -05:00

.clang-format

5.6.41-84.1

2018-10-27 20:53:19 +02:00

CMakeLists.txt

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

2018-10-31 08:46:37 +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