mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 07:44:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/storage/xtradb
History
Seppo Jaakola bd0eae595f References: MDEV-4572 - merge with mariaDB 5.5.31 
bzr merge lp:maria/5.5 -rtag:mariadb-5.5.31

Text conflict in cmake/cpack_rpm.cmake
Text conflict in debian/dist/Debian/control
Text conflict in debian/dist/Ubuntu/control
Text conflict in sql/CMakeLists.txt
Conflict adding file sql/db.opt.  Moved existing file to sql/db.opt.moved.
Conflict adding file sql/db.opt.moved.  Moved existing file to sql/db.opt.moved.moved.
Text conflict in sql/mysqld.cc
Text conflict in support-files/mysql.spec.sh
8 conflicts encountered.
2013-05-26 11:26:58 +03:00
..
btr Merge with XtraDB as of Percona-Server-5.5.30-rel30.2 2013-05-08 10:12:21 +02:00
buf Merge with XtraDB as of Percona-Server-5.5.30-rel30.2 2013-05-08 10:12:21 +02:00
data
dict References: MDEV-4572 - merge with mariaDB 5.5.31 2013-05-26 11:26:58 +03:00
dyn
eval
fil Merge with XtraDB as of Percona-Server-5.5.30-rel30.2 2013-05-08 10:12:21 +02:00
fsp Merge with XtraDB as of Percona-Server-5.5.30-rel30.2 2013-05-08 10:12:21 +02:00
fut
ha XtraDB from Percona-Server-5.5.27-rel28.1 2012-09-05 13:14:37 +02:00
handler References: MDEV-4572 - merge with mariaDB 5.5.31 2013-05-26 11:26:58 +03:00
ibuf merge with XtraDB as of Percona-Server-5.5.29-rel30.0 2013-02-28 23:56:17 +01:00
include References: MDEV-4572 - merge with mariaDB 5.5.31 2013-05-26 11:26:58 +03:00
lock References: MDEV-4572 - merge with mariaDB 5.5.31 2013-05-26 11:26:58 +03:00
log Merge with XtraDB as of Percona-Server-5.5.30-rel30.2 2013-05-08 10:12:21 +02:00
mach
mem XtraDB from Percona-Server-5.5.27-rel28.1 2012-09-05 13:14:37 +02:00
mtr Merge with XtraDB as of Percona-Server-5.5.30-rel30.2 2013-05-08 10:12:21 +02:00
os References: MDEV-4572 - merge with mariaDB 5.5.31 2013-05-26 11:26:58 +03:00
page merge with XtraDB as of Percona-Server-5.5.29-rel30.0 2013-02-28 23:56:17 +01:00
pars merged with XtraDB 1.1.8-26.0 2012-06-15 14:54:23 +02:00
que
read Merge with XtraDB as of Percona-Server-5.5.30-rel30.2 2013-05-08 10:12:21 +02:00
rem References: MDEV-4572 - merge with mariaDB 5.5.30 2013-05-24 15:29:01 +03:00
row References: MDEV-4572 - merge with mariaDB 5.5.31 2013-05-26 11:26:58 +03:00
srv References: MDEV-4572 - merge with mariaDB 5.5.31 2013-05-26 11:26:58 +03:00
sync MDEV-4243 Warnings/errors while compiling with clang 2013-03-28 20:04:14 +01:00
trx References: MDEV-4572 - merge with mariaDB 5.5.31 2013-05-26 11:26:58 +03:00
usr
ut XtraDB 1.1.8-29.0 2012-10-16 10:36:28 +02:00
CMakeLists.txt XtraDB 1.1.8-29.0 2012-10-16 10:36:28 +02:00
COPYING.Google
COPYING.Percona
Doxyfile
ha_innodb.def