Sergey Petrunya 7df026676b Merge MariaDB-5.2 -> MariaDB 5.3

2010-03-20 15:01:47 +03:00

..

btr

merged

2010-03-15 12:51:23 +01:00

buf

Merge with fixes for compiler warnings and 2 fixed test cases

2010-01-28 13:35:10 +02:00

data

Merge XtraDB 9 into MariaDB.

2010-01-15 16:58:25 +01:00

dict

Merge XtraDB 9 into MariaDB.

2010-01-15 16:58:25 +01:00

dyn

Merge XtraDB 8 into MariaDB.

2009-11-13 22:26:08 +01:00

eval

Merge XtraDB 8 into MariaDB.

2009-11-13 22:26:08 +01:00

fil

merge 5.1->5.2

2010-02-01 08:14:12 +02:00

fsp

Merge XtraDB 9 into MariaDB.

2010-01-15 16:58:25 +01:00

fut

Merge XtraDB 8 into MariaDB.

2009-11-13 22:26:08 +01:00

ha

Merge XtraDB 8 into MariaDB.

2009-11-13 22:26:08 +01:00

handler

Merge MariaDB-5.2 -> MariaDB 5.3

2010-03-20 15:01:47 +03:00

ibuf

Merge XtraDB 9 into MariaDB.

2010-01-15 16:58:25 +01:00

include

Merge MariaDB-5.2 -> MariaDB 5.3

2010-03-20 15:01:47 +03:00

lock

Merge XtraDB 9 into MariaDB.

2010-01-15 16:58:25 +01:00

log

Merge XtraDB 9 into MariaDB.

2010-01-15 16:58:25 +01:00

mach

Merge XtraDB 8 into MariaDB.

2009-11-13 22:26:08 +01:00

mem

Merge XtraDB 9 into MariaDB.

2010-01-15 16:58:25 +01:00

mtr

Merge XtraDB 9 into MariaDB.

2010-01-15 16:58:25 +01:00

os

Merge XtraDB 9 into MariaDB.

2010-01-15 16:58:25 +01:00

page

Merge XtraDB 9 into MariaDB.

2010-01-15 16:58:25 +01:00

pars

Fixed race condition when innobase_shutdown_for_mysql() was called before parser was initialized (as it's initialized on first usage)

2010-01-17 13:41:32 +02:00

que

Merge XtraDB 9 into MariaDB.

2010-01-15 16:58:25 +01:00

read

Merge XtraDB 8 into MariaDB.

2009-11-13 22:26:08 +01:00

rem

Merge XtraDB 9 into MariaDB.

2010-01-15 16:58:25 +01:00

row

Merge MariaDB-5.2 -> MariaDB 5.3

2010-03-20 15:01:47 +03:00

scripts

Merge XtraDB 9 into MariaDB.

2010-01-15 16:58:25 +01:00

srv

Fix freed-twice error in XtraDB (from InnoDB plugin 1.0.6).

2010-01-17 09:41:43 +01:00

sync

Merge XtraDB 9 into MariaDB.

2010-01-15 16:58:25 +01:00

thr

Merge XtraDB 9 into MariaDB.

2010-01-15 16:58:25 +01:00

trx

Merge XtraDB 9 into MariaDB.

2010-01-15 16:58:25 +01:00

usr

Merge XtraDB 9 into MariaDB.

2010-01-15 16:58:25 +01:00

ut

Merge XtraDB 9 into MariaDB.

2010-01-15 16:58:25 +01:00

ChangeLog

Merge XtraDB 9 into MariaDB.

2010-01-15 16:58:25 +01:00

CMakeLists.txt

Merge XtraDB 9 into MariaDB.

2010-01-15 16:58:25 +01: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

COPYING.Sun_Microsystems

Merge XtraDB 8 into MariaDB.

2009-11-13 22:26:08 +01:00

Doxyfile

Merge XtraDB 8 into MariaDB.

2009-11-13 22:26:08 +01:00

ha_innodb.def

Import Percona XtraDB into the MariaDB source tree.

2009-06-09 13:16:11 +02:00

Makefile.am

Merge XtraDB 9 into MariaDB.

2010-01-15 16:58:25 +01:00

plug.in

Merge XtraDB 9 into MariaDB.

2010-01-15 16:58:25 +01:00