mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/storage/xtradb
History
Sergei Golubchik f61f36b386 Merge branch '10.0' into 10.1 
Conflicts:
	CMakeLists.txt
	VERSION
Modified:
	.gitignore
2014-06-13 16:10:25 +02:00
..
api xtradb 5.6.17-65.0 2014-05-07 17:33:33 +02:00
btr xtradb 5.6.17-65.0 2014-05-07 17:33:33 +02:00
buf Merge 10.0 -> 10.1 2014-05-24 21:37:21 +03:00
data Percona-Server-5.6.14-rel62.0 merge 2013-12-22 17:06:50 +01:00
dict Merge 10.0 -> 10.1 2014-05-24 21:37:21 +03: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 don't include <linux/falloc.h> when it's not really needed 2014-05-27 14:29:05 +02:00
fsp Percona-Server-5.6.14-rel62.0 merge 2013-12-22 17:06:50 +01:00
fts xtradb 5.6.17-65.0 2014-05-07 17:33:33 +02: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 branch '10.0' into 10.1 2014-06-13 16:10:25 +02:00
ibuf xtradb 5.6.17-65.0 2014-05-07 17:33:33 +02:00
include merge the compilation fixes from 10.0-FusionIO 2014-05-26 21:11:53 +02:00
lock xtradb 5.6.17-65.0 2014-05-07 17:33:33 +02:00
log merge the compilation fixes from 10.0-FusionIO 2014-05-26 21:11:53 +02: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
os don't include <linux/falloc.h> when it's not really needed 2014-05-27 14:29:05 +02:00
page Merge 10.0 -> 10.1 2014-05-24 21:37:21 +03: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 Percona-Server-5.6.14-rel62.0 merge 2013-12-22 17:06:50 +01:00
rem xtradb 5.6.17-65.0 2014-05-07 17:33:33 +02:00
row Merge 10.0 -> 10.1 2014-05-24 21:37:21 +03:00
srv merge the compilation fixes from 10.0-FusionIO 2014-05-26 21:11:53 +02:00
sync xtradb 5.6.17-65.0 2014-05-07 17:33:33 +02:00
trx xtradb 5.6.17-65.0 2014-05-07 17:33:33 +02:00
usr Percona-Server-5.6.14-rel62.0 merge 2013-12-22 17:06:50 +01:00
ut Merge 10.0 -> 10.1 2014-05-24 21:37:21 +03:00
CMakeLists.txt MDEV-6246: Merge 10.0.10-FusionIO to 10.1. 2014-05-22 14:24:00 +03:00
COPYING.Google Import Percona XtraDB into the MariaDB source tree. 2009-06-09 13:16:11 +02:00
COPYING.Percona Merge XtraDB 8 into MariaDB. 2009-11-13 22:26:08 +01:00
Doxyfile merge with xtradb-5.5.15 2011-07-18 23:04:24 +02:00
ha_innodb.def Import Percona XtraDB into the MariaDB source tree. 2009-06-09 13:16:11 +02:00