mariadb/storage/xtradb
Seppo Jaakola b96af9a3ab references lp:1011983
Merged latest MariaDB development in: bzr merge lp:maria/5.5
=> 
Text conflict in CMakeLists.txt
Text conflict in sql/handler.h
Text conflict in support-files/CMakeLists.txt
3 conflicts
2012-06-12 16:34:18 +03:00
..
btr
buf Only synchronous disk reads should use thd_wait_begin with THD_WAIT_DISKIO 2012-02-16 18:12:40 +01:00
data
dict
dyn
eval
fil
fsp mysql 5.5.23 merge 2012-04-10 08:28:13 +02:00
fut
ha
handler references lp:1011983 2012-06-12 16:34:18 +03:00
ibuf
include References lp:1011983 2012-06-12 10:55:11 +03:00
lock Initial push of codership-wsrep API implementation for MariaDB. 2012-04-13 01:33:24 +03:00
log
mach
mem
mtr
os Merge with mariaDB 5.5.23: bzr merge lp:maria/5.5 2012-04-26 13:59:35 +03:00
page Merge with MariaDB 5.2 2012-02-21 01:58:50 +02:00
pars
que
read
rem References lp:1011983 2012-06-12 10:55:11 +03:00
row references lp:1011983 2012-06-12 16:34:18 +03:00
srv Initial push of codership-wsrep API implementation for MariaDB. 2012-04-13 01:33:24 +03:00
sync
trx Initial push of codership-wsrep API implementation for MariaDB. 2012-04-13 01:33:24 +03:00
usr
ut
CMakeLists.txt
COPYING.Google
COPYING.Percona
Doxyfile
ha_innodb.def