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 853077ad7e Merge branch '10.0' into bb-10.1-merge 
Conflicts:
	.bzrignore
	VERSION
	cmake/plugin.cmake
	debian/dist/Debian/control
	debian/dist/Ubuntu/control
	mysql-test/r/join_outer.result
	mysql-test/r/join_outer_jcl6.result
	mysql-test/r/null.result
	mysql-test/r/old-mode.result
	mysql-test/r/union.result
	mysql-test/t/join_outer.test
	mysql-test/t/null.test
	mysql-test/t/old-mode.test
	mysql-test/t/union.test
	packaging/rpm-oel/mysql.spec.in
	scripts/mysql_config.sh
	sql/ha_ndbcluster.cc
	sql/ha_ndbcluster_binlog.cc
	sql/ha_ndbcluster_cond.cc
	sql/item_cmpfunc.h
	sql/lock.cc
	sql/sql_select.cc
	sql/sql_show.cc
	sql/sql_update.cc
	sql/sql_yacc.yy
	storage/innobase/buf/buf0flu.cc
	storage/innobase/fil/fil0fil.cc
	storage/innobase/include/srv0srv.h
	storage/innobase/lock/lock0lock.cc
	storage/tokudb/CMakeLists.txt
	storage/xtradb/buf/buf0flu.cc
	storage/xtradb/fil/fil0fil.cc
	storage/xtradb/include/srv0srv.h
	storage/xtradb/lock/lock0lock.cc
	support-files/mysql.spec.sh
2014-12-02 22:25:16 +01:00
..
api XtraDB 5.6.21-70.0 2014-11-20 17:05:13 +01:00
btr Merge branch '10.0' into bb-10.1-merge 2014-12-02 22:25:16 +01:00
buf Merge branch '10.0' into bb-10.1-merge 2014-12-02 22:25:16 +01:00
data Percona-Server-5.6.14-rel62.0 merge 2013-12-22 17:06:50 +01:00
dict Merge branch '10.0' into bb-10.1-merge 2014-12-02 22:25:16 +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 Merge branch '10.0' into bb-10.1-merge 2014-12-02 22:25:16 +01:00
fsp Percona-Server-5.6.14-rel62.0 merge 2013-12-22 17:06:50 +01:00
fts MDEV-6928: Add trx pointer to struct mtr_t 2014-10-24 22:26:31 +03: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 bb-10.1-merge 2014-12-02 22:25:16 +01:00
ibuf xtradb 5.6.17-65.0 2014-05-07 17:33:33 +02:00
include Merge branch '10.0' into bb-10.1-merge 2014-12-02 22:25:16 +01:00
lock Merge branch '10.0' into bb-10.1-merge 2014-12-02 22:25:16 +01:00
log Merge branch '10.0' into bb-10.1-merge 2014-12-02 22:25:16 +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 branch '10.0' into bb-10.1-merge 2014-12-02 22:25:16 +01:00
page MDEV-6935: Change the default value for innodb_log_compressed_pages to false 2014-10-29 11:07:38 +02:00
pars MDEV-6929: Port Facebook Prefix Index Queries Optimization 2014-11-03 11:18:52 +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 MDEV-6247: Merge 10.0-galera to 10.1. 2014-08-26 15:43:46 +03:00
row Merge branch '10.0' into bb-10.1-merge 2014-12-02 22:25:16 +01:00
srv Merge branch '10.0' into bb-10.1-merge 2014-12-02 22:25:16 +01:00
sync Merge branch '10.0' into bb-10.1-merge 2014-12-02 22:25:16 +01:00
trx Merge branch '10.0' into bb-10.1-merge 2014-12-02 22:25:16 +01:00
usr Percona-Server-5.6.14-rel62.0 merge 2013-12-22 17:06:50 +01:00
ut MDEV-5834: Merge Kakao Defragmentation implementation to MariaDB 10.1 2014-08-06 15:28:58 +03:00
CMakeLists.txt Merge 10.0.14 into 10.1 2014-10-15 12:59:13 +02: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