mariadb/storage/xtradb
Nirbhay Choubey af651c80f7 Merge tag 'mariadb-10.0.17' into 10.0-galera
Conflicts:
	storage/innobase/include/trx0trx.h
2015-02-27 17:36:54 -05:00
..
api XtraDB 5.6.21-70.0 2014-11-20 17:05:13 +01:00
btr MDEV-6288 :Innodb causes server crash after disk full, then can't ALTER TABLE any more 2015-02-13 11:49:31 +02:00
buf xtradb 5.6.22-72.0 2015-02-18 20:31:40 +01:00
data Percona-Server-5.6.14-rel62.0 merge 2013-12-22 17:06:50 +01:00
dict XtraDB 5.5.41-37.0 2015-02-11 20:40:56 +01:00
dyn Percona-Server-5.6.14-rel62.0 merge 2013-12-22 17:06:50 +01:00
eval Percona-Server-5.6.14-rel62.0 merge 2013-12-22 17:06:50 +01:00
fil MDEV-6288 :Innodb causes server crash after disk full, then can't ALTER TABLE any more 2015-02-13 11:49:31 +02:00
fsp Percona-Server-5.6.14-rel62.0 merge 2013-12-22 17:06:50 +01:00
fts XtraDB 5.6.22-71.0 2015-01-21 14:34:58 +01:00
fut Percona-Server-5.6.14-rel62.0 merge 2013-12-22 17:06:50 +01:00
ha Percona-Server-5.6.14-rel62.0 merge 2013-12-22 17:06:50 +01:00
handler Merge tag 'mariadb-10.0.17' into 10.0-galera 2015-02-27 17:36:54 -05:00
ibuf Merge branch '5.5' into 10.0 2015-02-18 15:16:27 +01:00
include Merge tag 'mariadb-10.0.17' into 10.0-galera 2015-02-27 17:36:54 -05:00
lock Merge tag 'mariadb-10.0.17' into 10.0-galera 2015-02-27 17:36:54 -05:00
log XtraDB 5.5.41-37.0 2015-02-11 20:40:56 +01:00
mach Percona-Server-5.6.14-rel62.0 merge 2013-12-22 17:06:50 +01:00
mem MDEV-6184 10.0.11 merge 2014-05-06 10:21:34 +02:00
mtr MDEV-6184 10.0.11 merge 2014-05-06 10:21:34 +02:00
mysql-test/storage_engine Changes in storage_engine test suite: 2014-09-15 20:33:11 +04:00
os Merge tag 'mariadb-10.0.17' into 10.0-galera 2015-02-27 17:36:54 -05:00
page XtraDB 5.6.22-71.0 2015-01-21 14:34:58 +01:00
pars xtradb 5.6.17-65.0 2014-05-07 17:33:33 +02:00
que Percona-Server-5.6.14-rel62.0 merge 2013-12-22 17:06:50 +01:00
read xtradb-5.6.19-67.0 2014-08-06 19:57:06 +02:00
rem Merge branch '10.0' into 10.0-galera 2015-02-18 18:07:45 -05:00
row Merge tag 'mariadb-10.0.17' into 10.0-galera 2015-02-27 17:36:54 -05:00
srv Merge tag 'mariadb-10.0.17' into 10.0-galera 2015-02-27 17:36:54 -05:00
sync XtraDB 5.6.22-71.0 2015-01-21 14:34:58 +01:00
trx bzr merge -rtag:mariadb-10.0.15 maria/10.0 2014-12-05 12:33:02 -05:00
usr Percona-Server-5.6.14-rel62.0 merge 2013-12-22 17:06:50 +01:00
ut xtradb 5.6.17-65.0 2014-05-07 17:33:33 +02:00
wsrep MDEV#5626 : Cannot install InnoDB/XtraDB plugin 2014-02-10 09:22:24 -05:00
CMakeLists.txt Merge branch '10.0' into 10.0-galera 2015-02-18 18:07:45 -05:00
COPYING.Google
COPYING.Percona
Doxyfile
ha_innodb.def